summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2013-01-04 18:35:27 +0000
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2013-01-04 18:35:27 +0000
commit67932d809686edd04a6ca9ba1748f763254c0552 (patch)
tree7a8cf1a5a3b0b6207dda038c6abf672300f7b49b
parent5efeaedf21223f18975013360abcdcf1fc4d0a24 (diff)
e: fix crash when changing desktops configuration
#0 0x00007f33b8eb1b1d in pause () from /usr/lib/libpthread.so.0 #1 <signal handler called> #2 0x00007f33a19c19ab in _clock_popup_desk_change (inst=0x2bb2360, type=176, ev=0x36a6680) at clock/e_mod_main.c:305 #3 0x00007f33b982499c in _ecore_call_handler_cb (event=<optimized out>, type=<optimized out>, data=<optimized out>, func=<optimized out>) at lib/ecore/ecore_private.h:354 #4 _ecore_event_call () at lib/ecore/ecore_events.c:562 #5 0x00007f33b982a639 in _ecore_main_loop_iterate_internal (once_only=once_only@entry=0) at lib/ecore/ecore_main.c:1942 #6 0x00007f33b982abc7 in ecore_main_loop_begin () at lib/ecore/ecore_main.c:964 #7 0x0000000000434b73 in main (argc=<optimized out>, argv=<optimized out>) at e_main.c:1061 SVN revision: 82225
-rw-r--r--src/modules/clock/e_mod_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c
index e0bb17b3f..b712bf9e2 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
302static Eina_Bool 302static Eina_Bool
303_clock_popup_desk_change(Instance *inst, int type __UNUSED__, E_Event_Desk_After_Show *ev) 303_clock_popup_desk_change(Instance *inst, int type __UNUSED__, E_Event_Desk_After_Show *ev)
304{ 304{
305 if (!inst->gcc->gadcon->shelf) return ECORE_CALLBACK_RENEW; 305 if (!inst->gcc->gadcon || !inst->gcc->gadcon->shelf) return ECORE_CALLBACK_RENEW;
306 if (e_shelf_desk_visible(inst->gcc->gadcon->shelf, ev->desk)) return ECORE_CALLBACK_RENEW; 306 if (e_shelf_desk_visible(inst->gcc->gadcon->shelf, ev->desk)) return ECORE_CALLBACK_RENEW;
307 _clock_popup_free(inst); 307 _clock_popup_free(inst);
308 return ECORE_CALLBACK_RENEW; 308 return ECORE_CALLBACK_RENEW;