From 37d444fa0f79aac43f25b90c67157256a874b433 Mon Sep 17 00:00:00 2001 From: Igor Murzov Date: Tue, 22 Jan 2013 16:25:38 +0000 Subject: [PATCH] e: fix crash when changing desktops configuration This is a backport of r82225 SVN revision: 83094 --- ChangeLog | 4 ++++ NEWS | 1 + src/modules/clock/e_mod_main.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3d381c52f..afb0d2a88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-01-22 Lucas De Marchi + + * Fixed crash when changing desktops configuration + 2013-01-22 Massimo Maiurana * Added three more files for input methods used in asian countries diff --git a/NEWS b/NEWS index 77597d9ef..799ec940d 100644 --- a/NEWS +++ b/NEWS @@ -35,3 +35,4 @@ Fixes: * fixed bug where backlight settings would try to update dummy backlight devices * fixed gadget dragging on desktop near screen edges * fixed bug where "don't composite fullscreen windows" option would cause some windows to stop appearing + * Fixed crash when changing desktops configuration diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c index 0fab8977d..c87f0f93c 100644 --- a/src/modules/clock/e_mod_main.c +++ b/src/modules/clock/e_mod_main.c @@ -302,7 +302,7 @@ _clock_popup_fullscreen_change(Instance *inst, int type __UNUSED__, void *ev __U static Eina_Bool _clock_popup_desk_change(Instance *inst, int type __UNUSED__, E_Event_Desk_After_Show *ev) { - if (!inst->gcc->gadcon->shelf) return ECORE_CALLBACK_RENEW; + if (!inst->gcc->gadcon || !inst->gcc->gadcon->shelf) return ECORE_CALLBACK_RENEW; if (e_shelf_desk_visible(inst->gcc->gadcon->shelf, ev->desk)) return ECORE_CALLBACK_RENEW; _clock_popup_free(inst); return ECORE_CALLBACK_RENEW;