From 4638a85c8397a05ca7be9288c2daeebd10094ec2 Mon Sep 17 00:00:00 2001
From: stsdc <6031763+stsdc@users.noreply.github.com>
Date: Wed, 11 Mar 2026 22:22:30 +0100
Subject: [PATCH 1/2] MainWindow: do not destroy the MainWindow on close when
 the indicator is enabled

---
 src/MainWindow.vala | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index f87d7cf5..fbe1b807 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -13,6 +13,18 @@ public class Monitor.MainWindow : Gtk.ApplicationWindow {
     construct {
         title = _("Monitor");
 
+        close_request.connect (() => {
+            if (MonitorApp.settings.get_boolean ("indicator-state")) {
+                debug ("Indicator is enabled, hiding the window instead of closing");
+                hide ();
+                return true;
+            }
+            debug ("Close the window");
+            close ();
+            return false;
+        });
+
+
         var resources = new Resources ();
 
         process_view = new ProcessView ();

From a94d5cb9d546255106b4e0d74d95b1ad6a6490ad Mon Sep 17 00:00:00 2001
From: stsdc <6031763+stsdc@users.noreply.github.com>
Date: Thu, 26 Mar 2026 16:05:49 +0100
Subject: [PATCH 2/2] MainWindow: Use GDK consts to handle close request

---
 src/MainWindow.vala | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index fbe1b807..6b464716 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -17,11 +17,10 @@ public class Monitor.MainWindow : Gtk.ApplicationWindow {
             if (MonitorApp.settings.get_boolean ("indicator-state")) {
                 debug ("Indicator is enabled, hiding the window instead of closing");
                 hide ();
-                return true;
+                return Gdk.EVENT_STOP;
             }
             debug ("Close the window");
-            close ();
-            return false;
+            return Gdk.EVENT_PROPAGATE;
         });