wl_desktop_shell: fix the bug that couldn't hide a not deleted client when xdg_shell...

Change-Id: Ieec65c5dbbefeba878ab32afeaee6d75763fbb40

diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c
index 8198fea8e1e79bb25c2cfc15879f9d661a99f22f..41233496fa22257be3d2e53b446b05f6c9e90450 100644 (file)
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -96,13 +96,11 @@ _e_shell_surface_destroy(struct wl_resource *resource)
    /* get the client for this resource */
    if ((ec = wl_resource_get_user_data(resource)))
      {
-        if (ec->comp_data)
-          ec->comp_data->shell.surface = NULL;
+        if (!ec->comp_data)
+          return;
 
-        if (!e_object_unref(E_OBJECT(ec))) return;
-        if (e_object_is_del(E_OBJECT(ec))) return;
-
-        if (ec->comp_data)
+        if ((e_object_unref(E_OBJECT(ec))) &&
+            (!e_object_is_del(E_OBJECT(ec))))
           {
              if (ec->comp_data->mapped)
                {
@@ -113,10 +111,11 @@ _e_shell_surface_destroy(struct wl_resource *resource)
              if (ec->parent)
                {
                   ec->parent->transients =
-                    eina_list_remove(ec->parent->transients, ec);
+                     eina_list_remove(ec->parent->transients, ec);
                }
              /* wl_resource_destroy(ec->comp_data->shell.surface); */
           }
+        ec->comp_data->shell.surface = NULL;
      }
 }