Make sure popover closeAll is called on the main thread (#337)

Fixes #336
pakerwreah · Jan 3, 2025 · dac36b5 · dac36b5
1 parent 4995b5b
commit dac36b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Calendr.xcodeproj/project.pbxproj b/Calendr.xcodeproj/project.pbxproj
@@ -1507,7 +1507,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.15.1;
+				MARKETING_VERSION = 1.15.2;
 				PRODUCT_BUNDLE_IDENTIFIER = br.paker.Calendr;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Calendr/Config/Calendr-Bridging-Header.h";
@@ -1535,7 +1535,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.15.1;
+				MARKETING_VERSION = 1.15.2;
 				PRODUCT_BUNDLE_IDENTIFIER = br.paker.Calendr;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Calendr/Config/Calendr-Bridging-Header.h";

diff --git a/Calendr/Components/Popover.swift b/Calendr/Components/Popover.swift
@@ -108,6 +108,10 @@ class Popover: NSObject, PopoverWindowDelegate {
     }
 
     static func closeAll() {
+        guard Thread.isMainThread else {
+            DispatchQueue.main.sync { closeAll() }
+            return
+        }
         for popover in popovers {
             popover.window?.performClose(nil)
         }