summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-02-12 15:58:06 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-02-12 16:25:35 +0900
commit26b68f8c7e43621187d3303eb23238c81713e270 (patch)
tree421748bec89b4bbff300959d7368ce162dc5f582
parentf91086be7d1e33c13789df7c9acdb37638a4f8a1 (diff)
downloadenlightenment-26b68f8c7e43621187d3303eb23238c81713e270.tar.gz
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.
-rw-r--r--src/modules/mixer/lib/backends/pulseaudio/pulse.c9
1 files 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 d578e85790..4773e35528 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