Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio

[pulseaudio] / src / pulsecore / core-util.c

diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index eeb81a604283c6819e75d515726b9402cc22285f..1daa46eb592576103f9047b4f2665682bf411873 100644 (file)
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -2484,9 +2484,11 @@ void pa_unset_env_recorded(void) {
     /* This is not thread-safe */
 
     for (;;) {
-        char *s = NULL;
+        char *s;
 
-        if (!(recorded_env = pa_strlist_pop(recorded_env, &s)))
+        recorded_env = pa_strlist_pop(recorded_env, &s);
+
+        if (!s)
             break;
 
         unsetenv(s);