summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2017-10-25 14:09:12 -0500
committerDerek Foreman <derekf@osg.samsung.com>2017-10-25 14:17:10 -0500
commitfa1a8583564e86e729e77560fb2faa92175387d1 (patch)
tree60f0a615e4912236f51455d6b1195d0fff69b393 /src/modules
parent930cf317d61618fe0c7178632544fab961c9d438 (diff)
Fix crash on wayland logout if xwayland hasn't started yet
If xwayland hasn't started yet then the root window id is 0, which is invalid, so we crash in e_comp_x_shutdown.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/xwayland/e_mod_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/xwayland/e_mod_main.c b/src/modules/xwayland/e_mod_main.c
index 1b6ccc8..f3826c3 100644
--- a/src/modules/xwayland/e_mod_main.c
+++ b/src/modules/xwayland/e_mod_main.c
@@ -451,7 +451,7 @@ xwl_shutdown(void)
451 if (exs->sig_hdlr) ecore_event_handler_del(exs->sig_hdlr); 451 if (exs->sig_hdlr) ecore_event_handler_del(exs->sig_hdlr);
452 452
453 free(exs); 453 free(exs);
454 e_comp_x_shutdown(); 454 if (e_comp_util_has_x()) e_comp_x_shutdown();
455 ecore_x_shutdown(); 455 ecore_x_shutdown();
456 e_util_env_set("DISPLAY", NULL); 456 e_util_env_set("DISPLAY", NULL);
457} 457}