From: ChunEon Park Date: Mon, 20 May 2013 11:03:31 +0000 (+0900) Subject: elementary/win - prevent to add the timer multiple times. X-Git-Tag: submit/tizen_2.2/20130714.145026~235 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c217648fb8a1439b3aadc3e9bdcb2bae37521466;p=framework%2Fuifw%2Felementary.git elementary/win - prevent to add the timer multiple times. elementary/ews_wm - prevent to add a duplicated animator. commit 0e9cd6e86425ebb8e2a3e8454e999496d10c1811 Author: ChunEon Park @hermet.pe.kr> Date: Mon May 20 19:09:13 2013 +0900 commit 9bcb15b2603598f5ca9ff20548d0a5c3fdfb5bdb Author: ChunEon Park @hermet.pe.kr> Date: Mon May 20 19:17:57 2013 +0900 --- diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index a72d916..2a1c359 100755 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -546,7 +546,8 @@ _shot_handle(Elm_Win_Smart_Data *sd) { if (!sd->shot.info) return; - sd->shot.timer = ecore_timer_add(_shot_delay_get(sd), _shot_delay, sd); + if (!sd->shot.timer) + sd->shot.timer = ecore_timer_add(_shot_delay_get(sd), _shot_delay, sd); } /* elm-win specific associate, does the trap while ecore_evas_object_associate() @@ -928,8 +929,10 @@ _elm_win_profile_update(Ecore_Evas *ee) if (!obj) return; if (sd->profile.timer) - ecore_timer_del(sd->profile.timer); - sd->profile.timer = NULL; + { + ecore_timer_del(sd->profile.timer); + sd->profile.timer = NULL; + } /* It should be replaced per-window ELM profile later. */ _elm_config_profile_set(sd->profile.name); diff --git a/src/lib/elu_ews_wm.c b/src/lib/elu_ews_wm.c index 15fdb65..1b51b73 100644 --- a/src/lib/elu_ews_wm.c +++ b/src/lib/elu_ews_wm.c @@ -282,6 +282,7 @@ _elm_ews_border_sig_move_start(void *data, Evas_Object *o __UNUSED__, const char _ews_border_mover_off.x = x - ox; _ews_border_mover_off.y = y - oy; _ews_border_mover_obj = bs_o; + if (_ews_border_mover) ecore_animator_del(_ews_border_mover); _ews_border_mover = ecore_animator_add(_elm_ews_border_mover, ee); }