e: fix crash when changing desktops configuration

This is a backport of r82225


SVN revision: 83094
This commit is contained in:
Igor Murzov 2013-01-22 16:25:38 +00:00
parent f0ec4d0fe9
commit 37d444fa0f
3 changed files with 6 additions and 1 deletions

View File

@ -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

1
NEWS
View File

@ -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

View File

@ -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;