From 5854327c28018622112358ae7ec955a9993569bc Mon Sep 17 00:00:00 2001
From: bbedward <bbedward@gmail.com>
Date: Thu, 23 Jul 2026 14:09:38 -0400
Subject: [PATCH] settings: fix close IPC

fixes #2912
port 1.5
---
 quickshell/Modals/Settings/SettingsModal.qml | 16 +++++++++++-----
 quickshell/Services/PopoutService.qml        |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/quickshell/Modals/Settings/SettingsModal.qml b/quickshell/Modals/Settings/SettingsModal.qml
index 0d3bc7ed5..b5df81574 100644
--- a/quickshell/Modals/Settings/SettingsModal.qml
+++ b/quickshell/Modals/Settings/SettingsModal.qml
@@ -41,6 +41,9 @@ FloatingWindow {
     signal closingModal
 
     function show() {
+        if (visible && !backingWindowVisible) {
+            visible = false;
+        }
         visible = true;
     }
 
@@ -49,7 +52,11 @@ FloatingWindow {
     }
 
     function toggle() {
-        visible = !visible;
+        if (visible && backingWindowVisible) {
+            hide();
+            return;
+        }
+        show();
     }
 
     function setTabIndex(tabIndex: int) {
@@ -61,13 +68,12 @@ FloatingWindow {
 
     function showWithTab(tabIndex: int) {
         setTabIndex(tabIndex);
-        visible = true;
+        show();
     }
 
     function showWithTabName(tabName: string) {
-        var idx = sidebar.resolveTabIndex(tabName);
-        setTabIndex(idx);
-        visible = true;
+        setTabIndex(sidebar.resolveTabIndex(tabName));
+        show();
     }
 
     function resolveTabIndex(tabName: string): int {
diff --git a/quickshell/Services/PopoutService.qml b/quickshell/Services/PopoutService.qml
index e89ab2585..d0326d8d7 100644
--- a/quickshell/Services/PopoutService.qml
+++ b/quickshell/Services/PopoutService.qml
@@ -425,7 +425,7 @@ Singleton {
     }
 
     function closeSettings() {
-        settingsModal?.close();
+        settingsModal?.hide();
     }
 
     function toggleSettings() {