enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

mixer: only save state if not in init 

If we are calling emix_config_save_state_get while in init, we are
freeing the list emix_config_save_state_restore is iterating over.
This leads to crashes.

@fix T2942
@fix T2906
This commit is contained in:
Marcel Hollerbach 2015-12-18 13:15:25 +01:00
parent d9e01e851f
commit f174008a83
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/mixer/e_mod_main.c
View File

@ -7,6 +7,7 @@
#define VOLUME_STEP 5 #define VOLUME_STEP 5
int _e_emix_log_domain; int _e_emix_log_domain;
static Eina_Bool init;
/* module requirements */ /* module requirements */
E_API E_Module_Api e_modapi = E_API E_Module_Api e_modapi =
@ -650,7 +651,6 @@ _sink_event(int type, void *info)
mixer_context->sink_default = l->data; mixer_context->sink_default = l->data;
else else
mixer_context->sink_default = NULL; mixer_context->sink_default = NULL;
emix_config_save_state_get();
if (emix_config_save_get()) e_config_save_queue(); if (emix_config_save_get()) e_config_save_queue();
_mixer_gadget_update(); _mixer_gadget_update();
} }
@ -667,8 +667,17 @@ _sink_event(int type, void *info)
{ {
DBG("Sink added"); DBG("Sink added");
} }
emix_config_save_state_get(); /*
if (emix_config_save_get()) e_config_save_queue(); Only safe the state if we are not in init mode,
If we are in init mode, this is a result of the restore call.
Restore iterates over a list of sinks which would get deleted in the
save_state_get call.
*/
if (!init)
{
emix_config_save_state_get();
if (emix_config_save_get()) e_config_save_queue();
}
} }
static void static void
@ -678,9 +687,11 @@ _disconnected(void)
_mixer_gadget_update(); _mixer_gadget_update();
} }
static void static void
_ready(void) _ready(void)
{ {
init = EINA_TRUE;
if (emix_sink_default_support()) if (emix_sink_default_support())
mixer_context->sink_default = emix_sink_default_get(); mixer_context->sink_default = emix_sink_default_get();
else else
@ -713,6 +724,7 @@ _ready(void)
} }
_mixer_gadget_update(); _mixer_gadget_update();
init = EINA_FALSE;
} }
static void static void