if inst->channel is null... dont segv at least in mixer.
This commit is contained in:
parent
b78f562132
commit
0985de0051
|
@ -590,9 +590,10 @@ _mixer_popup_new(E_Mixer_Instance *inst)
|
||||||
state = &inst->mixer_state;
|
state = &inst->mixer_state;
|
||||||
e_mod_mixer_state_get(inst->sys, inst->channel, state);
|
e_mod_mixer_state_get(inst->sys, inst->channel, state);
|
||||||
|
|
||||||
if (e_mod_mixer_channel_has_no_volume(inst->channel) ||
|
if ((inst->channel) &&
|
||||||
e_mod_mixer_channel_is_mono(inst->channel) ||
|
(e_mod_mixer_channel_has_no_volume(inst->channel) ||
|
||||||
(inst->conf->lock_sliders && !inst->conf->show_locked))
|
e_mod_mixer_channel_is_mono(inst->channel) ||
|
||||||
|
(inst->conf->lock_sliders && !inst->conf->show_locked)))
|
||||||
colspan = 1;
|
colspan = 1;
|
||||||
else
|
else
|
||||||
colspan = 2;
|
colspan = 2;
|
||||||
|
@ -620,7 +621,8 @@ _mixer_popup_new(E_Mixer_Instance *inst)
|
||||||
}
|
}
|
||||||
else
|
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);
|
inst->ui.left = _mixer_popup_add_slider(inst, 0, NULL);
|
||||||
e_widget_table_object_append(inst->ui.table, inst->ui.left,
|
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;
|
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);
|
inst->ui.mute = e_widget_check_add(evas, _("Mute"), &state->mute);
|
||||||
evas_object_show(inst->ui.mute);
|
evas_object_show(inst->ui.mute);
|
||||||
|
|
Loading…
Reference in New Issue