cnp - dont access null parent obj in getting xwin
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>
Wed, 15 Jan 2014 00:59:01 +0000 (09:59 +0900)
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>
Wed, 15 Jan 2014 00:59:37 +0000 (09:59 +0900)
src/lib/elm_cnp.c

index ff030922cccafd2603b22567ff648a5f6dbf5566..9febad71814f4dc90b43595de7a6de206b1c36f1 100644 (file)
@@ -1684,11 +1684,15 @@ _x11_drag_move(void *data EINA_UNUSED, Ecore_X_Xdnd_Position *pos)
 static Ecore_X_Window
 _x11_elm_widget_xwin_get(const Evas_Object *obj)
 {
-   Evas_Object *top;
+   Evas_Object *top, *par;
    Ecore_X_Window xwin = 0;
 
    top = elm_widget_top_get(obj);
-   if (!top) top = elm_widget_top_get(elm_widget_parent_widget_get(obj));
+   if (!top)
+     {
+        par = elm_widget_parent_widget_get(obj);
+        if (par) top = elm_widget_top_get(par);
+     }
    if (top) xwin = elm_win_xwindow_get(top);
    if (!xwin)
      {