forked from enlightenment/enlightenment
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:
parent
475a246ea9
commit
a57ce9ca85
|
@ -24,7 +24,9 @@ _e_shell_surface_parent_set(E_Client *ec, struct wl_resource *parent_resource)
|
||||||
}
|
}
|
||||||
return;
|
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");
|
ERR("Could not get parent resource client");
|
||||||
return;
|
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;
|
if (ec->parent->modal == ec) ec->parent->modal = NULL;
|
||||||
ec->parent = NULL;
|
ec->parent = NULL;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
pc = NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((pc != ec) &&
|
if ((pc != ec) &&
|
||||||
|
|
Loading…
Reference in New Issue