desktop_shell: Move emitting destroy signal

Change-Id: Iee2cb17324ebf0ac8a4180c847f925f663aa9e40

diff --git a/src/bin/server/e_desktop_shell.c b/src/bin/server/e_desktop_shell.c
index 13a886c4539f2e9ff69632c96046e4d25202dc5e..38ca104f3090dbb2ea627985d60b22daf7fd988b 100644 (file)
--- a/src/bin/server/e_desktop_shell.c
+++ b/src/bin/server/e_desktop_shell.c
@@ -36,7 +36,6 @@ _shell_cb_display_destroy(struct wl_listener *listener, void *data)
 {
    E_Desktop_Shell *shell = wl_container_of(listener, shell, display_destroy);
 
-   wl_signal_emit(&shell->events.destroy, shell);
    _shell_destroy(shell);
 }
 
@@ -63,6 +62,8 @@ _shell_create(struct wl_display *display)
 static void
 _shell_destroy(E_Desktop_Shell *shell)
 {
+   wl_signal_emit(&shell->events.destroy, shell);
+
    if (shell->e_comp_wl_shell)
      e_comp_wl_shell_destroy(shell->e_comp_wl_shell);