styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-06-25 12:05:05 -04:00
parent 475a246ea9
commit a57ce9ca85
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/wl_desktop_shell/e_mod_main.c
View File

@ -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) &&