raster pushed a commit to branch master.
commit 0985de00510220f96a11ac0f237213bdaffa8047
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Sun Apr 21 00:17:12 2013 +0900
if inst->channel is null... dont segv at least in mixer.
---
src/modules/mixer/e_mod_main.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index 5fd8f14..30b3458 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -590,9 +590,10 @@ _mixer_popup_new(E_Mixer_Instance *inst)
state = &inst->mixer_state;
e_mod_mixer_state_get(inst->sys, inst->channel, state);
- if (e_mod_mixer_channel_has_no_volume(inst->channel) ||
- e_mod_mixer_channel_is_mono(inst->channel) ||
- (inst->conf->lock_sliders && !inst->conf->show_locked))
+ if ((inst->channel) &&
+ (e_mod_mixer_channel_has_no_volume(inst->channel) ||
+ e_mod_mixer_channel_is_mono(inst->channel) ||
+ (inst->conf->lock_sliders && !inst->conf->show_locked)))
colspan = 1;
else
colspan = 2;
@@ -620,7 +621,8 @@ _mixer_popup_new(E_Mixer_Instance *inst)
}
else
{
- if (e_mod_mixer_channel_has_no_volume(inst->channel))
+ if ((inst->channel) &&
+ (e_mod_mixer_channel_has_no_volume(inst->channel)))
{
inst->ui.left = _mixer_popup_add_slider(inst, 0, NULL);
e_widget_table_object_append(inst->ui.table, inst->ui.left,
@@ -637,7 +639,7 @@ _mixer_popup_new(E_Mixer_Instance *inst)
inst->ui.right = NULL;
}
- if (e_mod_mixer_channel_is_mutable(inst->channel))
+ if ((inst->channel) && (e_mod_mixer_channel_is_mutable(inst->channel)))
{
inst->ui.mute = e_widget_check_add(evas, _("Mute"), &state->mute);
evas_object_show(inst->ui.mute);
--
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
