From: Po Lu <luangruo@yahoo.com>
Date: Wed, 27 Apr 2022 06:13:18 +0000 (+0000)
Subject: Fix quitting application from the Deskbar on Haiku
X-Git-Tag: emacs-29.0.90~1931^2~280
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e13689d55f4e3d445cf0457178a1508c0bb054be;p=emacs.git

Fix quitting application from the Deskbar on Haiku

* lisp/term/haiku-win.el (handle-save-session): Kill Emacs
afterwards.
---

diff --git a/lisp/term/haiku-win.el b/lisp/term/haiku-win.el
index 51a6c3c501e..403c737c114 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)