master e13689d55f: Fix quitting application from the Deskbar on Haiku

[Po Lu]

branch: master
commit e13689d55f4e3d445cf0457178a1508c0bb054be
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Fix quitting application from the Deskbar on Haiku
    
    * lisp/term/haiku-win.el (handle-save-session): Kill Emacs
    afterwards.
---
 lisp/term/haiku-win.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/term/haiku-win.el b/lisp/term/haiku-win.el
index 51a6c3c501..403c737c11 100644
--- a/lisp/term/haiku-win.el
+++ b/lisp/term/haiku-win.el
@@ -378,7 +378,10 @@ take effect on menu items until the menu bar is updated 
again."
   (let ((cancel-shutdown t))
     (unwind-protect
         (setq cancel-shutdown (emacs-session-save))
-      (haiku-save-session-reply (not cancel-shutdown)))))
+      (haiku-save-session-reply (not cancel-shutdown)))
+    ;; The App Server will kill Emacs after receiving the reply, but
+    ;; the Deskbar will not, so kill ourself here.
+    (unless cancel-shutdown (kill-emacs))))
 
 (provide 'haiku-win)
 (provide 'term/haiku-win)