From a57ce9ca8585f3fbea784fd8c3e9a9a9da09eb75 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Thu, 25 Jun 2015 12:05:05 -0400 Subject: [PATCH] wl-desktop-shell: Don't crash when trying to place popup menus in QT apps This is a partial fix for T2517. It fixes the crash, but does not address popup menu placement. Signed-off-by: Chris Michael --- src/modules/wl_desktop_shell/e_mod_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c index e262f8f3e..d69aa6089 100644 --- a/src/modules/wl_desktop_shell/e_mod_main.c +++ b/src/modules/wl_desktop_shell/e_mod_main.c @@ -24,7 +24,9 @@ _e_shell_surface_parent_set(E_Client *ec, struct wl_resource *parent_resource) } return; } - else if (!(pc = wl_resource_get_user_data(parent_resource))) + + pc = wl_resource_get_user_data(parent_resource); + if (!pc) { ERR("Could not get parent resource client"); return; @@ -44,8 +46,6 @@ _e_shell_surface_parent_set(E_Client *ec, struct wl_resource *parent_resource) if (ec->parent->modal == ec) ec->parent->modal = NULL; ec->parent = NULL; } - else - pc = NULL; } if ((pc != ec) &&