vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix e_randr eina log bitching when u dont have exisitng config! 

SVN revision: 68208
This commit is contained in:
Carsten Haitzler 2012-02-21 08:17:32 +00:00
parent 687c994aa2
commit 32ac589897
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bin/e_randr.c
View File

@ -63,7 +63,9 @@ _init(void)
if (e_randr_screen_info.randr_version >= ECORE_X_RANDR_1_2) if (e_randr_screen_info.randr_version >= ECORE_X_RANDR_1_2)
{ {
_12_policies_restore(); if ((e_config->randr_serialized_setup) &&
(e_config->randr_serialized_setup->outputs_policies))
_12_policies_restore();
} }
return EINA_TRUE; return EINA_TRUE;
@ -142,13 +144,16 @@ _event_listeners_add(void)
static void static void
_try_restore_configuration(void) _try_restore_configuration(void)
{ {
if (e_randr_screen_info.randr_version == ECORE_X_RANDR_1_1) if (e_config->randr_serialized_setup)
{ {
_11_try_restore_configuration(); if (e_randr_screen_info.randr_version == ECORE_X_RANDR_1_1)
} {
else if (e_randr_screen_info.randr_version >= ECORE_X_RANDR_1_2) _11_try_restore_configuration();
{ }
_12_try_restore_configuration(); else if (e_randr_screen_info.randr_version >= ECORE_X_RANDR_1_2)
{
_12_try_restore_configuration();
}
} }
} }

3
src/bin/e_randr_12.c
View File

@ -305,7 +305,8 @@ _12_screen_info_refresh(void)
{ {
EINA_SAFETY_ON_TRUE_RETURN(e_randr_screen_info.randr_version < ECORE_X_RANDR_1_2); EINA_SAFETY_ON_TRUE_RETURN(e_randr_screen_info.randr_version < ECORE_X_RANDR_1_2);
_12_screen_info_free(e_randr_screen_info.rrvd_info.randr_info_12); if (e_randr_screen_info.rrvd_info.randr_info_12)
_12_screen_info_free(e_randr_screen_info.rrvd_info.randr_info_12);
e_randr_screen_info.rrvd_info.randr_info_12 = _screen_info_12_new(); e_randr_screen_info.rrvd_info.randr_info_12 = _screen_info_12_new();
_structs_init(); _structs_init();
_screen_primary_output_assign(NULL); _screen_primary_output_assign(NULL);