Fix issue with closing settings dialog from taskbar

vanjac · Jul 26, 2022 · 46f86eb · 46f86eb
1 parent f2b4cd6
commit 46f86eb
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp
@@ -252,14 +252,14 @@ void openSettingsDialog() {
 }
 
 bool handleSettingsDialogMessage(MSG *msg) {
-    if (settingsDialog && PropSheet_IsDialogMessage(settingsDialog, msg)) {
-        if (!PropSheet_GetCurrentPageHwnd(settingsDialog)) {
-            DestroyWindow(settingsDialog);
-            settingsDialog = nullptr;
-        }
-        return true;
+    if (!settingsDialog)
+        return false;
+    bool isDialogMessage = !!PropSheet_IsDialogMessage(settingsDialog, msg);
+    if (!PropSheet_GetCurrentPageHwnd(settingsDialog)) {
+        DestroyWindow(settingsDialog);
+        settingsDialog = nullptr;
     }
-    return false;
+    return isDialogMessage;
 }
 
 } // namespace