summaryrefslogtreecommitdiff
path: root/src/pulsecore/proplist-util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-02-21 23:46:31 +0100
committerLennart Poettering <lennart@poettering.net>2009-02-21 23:46:31 +0100
commitedfa39a2af1c653fd8ccd6c34d7d2e49505d325f (patch)
treeae7ec37f09267d3f8706f141034646c33a7994e5 /src/pulsecore/proplist-util.c
parent77779ead6d09604573b7170fa27fb9a5926cd02e (diff)
downloadpulseaudio-edfa39a2af1c653fd8ccd6c34d7d2e49505d325f.tar.gz
make sure we don't choke on PULSE_PROP_OVERRIDE
Diffstat (limited to 'src/pulsecore/proplist-util.c')
-rw-r--r--src/pulsecore/proplist-util.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pulsecore/proplist-util.c b/src/pulsecore/proplist-util.c
index 7ba2fd71a..af5f0aa61 100644
--- a/src/pulsecore/proplist-util.c
+++ b/src/pulsecore/proplist-util.c
@@ -135,8 +135,9 @@ void pa_init_proplist(pa_proplist *p) {
k = pa_xstrndup(*e+skip, kl);
- if (override || !pa_proplist_contains(p, k))
- pa_proplist_sets(p, k, *e+skip+kl+1);
+ if (!pa_streq(k, "OVERRIDE"))
+ if (override || !pa_proplist_contains(p, k))
+ pa_proplist_sets(p, k, *e+skip+kl+1);
pa_xfree(k);
}
}