From 26b68f8c7e43621187d3303eb23238c81713e270 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sun, 12 Feb 2017 15:58:06 +0900 Subject: [PATCH] e mixer pulse backened -f ix warning about use of uninit var display really isn't uninitialized due to the logic, but compielr is kind of right in theory... but less warnings is better so we fix the real problems more easily. fix. --- src/modules/mixer/lib/backends/pulseaudio/pulse.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/modules/mixer/lib/backends/pulseaudio/pulse.c b/src/modules/mixer/lib/backends/pulseaudio/pulse.c index d578e8579..4773e3552 100644 --- a/src/modules/mixer/lib/backends/pulseaudio/pulse.c +++ b/src/modules/mixer/lib/backends/pulseaudio/pulse.c @@ -800,7 +800,7 @@ _pulse_connect(void *data) "org.enlightenment.volumecontrol"); pa_proplist_sets(proplist, PA_PROP_APPLICATION_ICON_NAME, "audio-card"); #if !defined(EMIXER_BUILD) && defined(HAVE_WAYLAND) && !defined(HAVE_WAYLAND_ONLY) - char *display; + char *display = NULL; if (e_comp->comp_type != E_PIXMAP_TYPE_X) { @@ -825,8 +825,11 @@ _pulse_connect(void *data) #if !defined(EMIXER_BUILD) && defined(HAVE_WAYLAND) && !defined(HAVE_WAYLAND_ONLY) if (e_comp->comp_type != E_PIXMAP_TYPE_X) { - e_env_set("DISPLAY", display); - free(display); + if (display) + { + e_env_set("DISPLAY", display); + free(display); + } } #endif