From: raster Date: Thu, 23 Jun 2011 05:50:20 +0000 (+0000) Subject: dont do x cursor stuff if no cur->win X-Git-Tag: REL_F_I9500_20120323_1~17^2~2512 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=383c9d82cd95b1e1046806d99c812b69d79c740b;p=framework%2Fuifw%2Felementary.git dont do x cursor stuff if no cur->win git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@60614 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/els_cursor.c b/src/lib/els_cursor.c index 8862af6..b8e00a0 100644 --- a/src/lib/els_cursor.c +++ b/src/lib/els_cursor.c @@ -219,7 +219,10 @@ _elm_cursor_mouse_in(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSE else { #ifdef HAVE_ELEMENTARY_X - ecore_x_window_cursor_set(cur->win, cur->cursor); + if (cur->win) + { + ecore_x_window_cursor_set(cur->win, cur->cursor); + } #endif } evas_event_thaw(cur->evas); @@ -260,7 +263,10 @@ _elm_cursor_mouse_out(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUS else { #ifdef HAVE_ELEMENTARY_X - ecore_x_window_cursor_set(cur->win, ECORE_X_CURSOR_X); + if (cur->win) + { + ecore_x_window_cursor_set(cur->win, ECORE_X_CURSOR_X); + } #endif } evas_event_thaw(cur->evas); @@ -310,14 +316,17 @@ _elm_cursor_cur_set(Elm_Cursor *cur) sizeof(struct _Cursor_Id), _elm_cursor_strcmp); cur->win = elm_win_xwindow_get(cur->eventarea); - if (!cur_id) + if (cur->win) { - INF("X cursor couldn't be found: %s. Using default.", - cur->cursor_name); - cur->cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_X); + if (!cur_id) + { + INF("X cursor couldn't be found: %s. Using default.", + cur->cursor_name); + cur->cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_X); + } + else + cur->cursor = ecore_x_cursor_shape_get(cur_id->id); } - else - cur->cursor = ecore_x_cursor_shape_get(cur_id->id); #endif } }