From cdd617d09421ea5c2b15a0b6005572a220409211 Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Fri, 21 Jul 2023 15:34:24 +0200
Subject: Wayland: slightly improve procedure to close toplevel window

---
 src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
index 52080c705..94314162d 100644
--- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
+++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
@@ -450,7 +450,7 @@ void Fl_Wayland_Window_Driver::hide() {
       wld_win->subsurface = NULL;
     }
     if (wld_win->kind == DECORATED) {
-      libdecor_frame_unref(wld_win->frame);
+      if (wld_win->frame) libdecor_frame_unref(wld_win->frame);
       wld_win->frame = NULL;
       wld_win->xdg_surface = NULL;
     } else {
@@ -907,14 +907,20 @@ void Fl_Wayland_Window_Driver::wait_for_expose()
 }
 
 static void delayed_close(void *data) {
-  Fl::remove_check(delayed_close, data);
-  Fl::handle(FL_CLOSE, (Fl_Window*)data);
+  if (data) {
+    Fl::remove_check(delayed_close, data);
+    Fl::handle(FL_CLOSE, (Fl_Window*)data);
+    Fl::add_timeout(0.01, delayed_close, NULL); // necessary for closing with app menu
+  }
 }
 
 static void handle_close(struct libdecor_frame *frame, void *user_data)
 { // runs when the close button of a window titlebar is pushed
+  // or after "Quit" of the application menu
+  libdecor_frame_unref(frame); // may or may not release frame
   struct wld_window* wl_win = (struct wld_window*)user_data;
   Fl::add_check(delayed_close, wl_win->fl_win);
+  wl_win->frame = NULL;
 }
 
 
-- 
cgit v1.2.3