From c30b82c2d1adada2abc082e377b3063731049ac5 Mon Sep 17 00:00:00 2001
From: Ryan Breen <ryan@breen.xyz>
Date: Sat, 11 Feb 2023 23:27:58 -0500
Subject: [PATCH] Fixing bug where options window won't close in some cases.

---
 .../ryan.xcuserdatad/xcschemes/xcschememanagement.plist      | 4 ++--
 Shared (Extension)/Resources/options.html                    | 2 +-
 Shared (Extension)/Resources/options.js                      | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Nostore.xcodeproj/xcuserdata/ryan.xcuserdatad/xcschemes/xcschememanagement.plist b/Nostore.xcodeproj/xcuserdata/ryan.xcuserdatad/xcschemes/xcschememanagement.plist
index 1e154e6..2fa6e1a 100644
--- a/Nostore.xcodeproj/xcuserdata/ryan.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Nostore.xcodeproj/xcuserdata/ryan.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,12 +7,12 @@
 		<key>Nostore (iOS).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 		<key>Nostore (macOS).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 		<key>nostore (iOS).xcscheme_^#shared#^_</key>
 		<dict>
diff --git a/Shared (Extension)/Resources/options.html b/Shared (Extension)/Resources/options.html
index d5786c4..c98d3c4 100644
--- a/Shared (Extension)/Resources/options.html	
+++ b/Shared (Extension)/Resources/options.html	
@@ -156,7 +156,7 @@
   </div>
 
   <div class="mt-6">
-    <button class="button" @click.prevent="window.close()">Close</button>
+    <button class="button" @click.prevent="closeOptions">Close</button>
     <button class="button" @click.prevent="clearData">Clear Data</button>
   </div>
 
diff --git a/Shared (Extension)/Resources/options.js b/Shared (Extension)/Resources/options.js
index 6507e07..7a806de 100644
--- a/Shared (Extension)/Resources/options.js	
+++ b/Shared (Extension)/Resources/options.js	
@@ -254,6 +254,11 @@ Alpine.data('options', () => ({
         }
     },
 
+    async closeOptions() {
+        const tab = await browser.tabs.getCurrent();
+        await browser.tabs.remove(tab.id);
+    },
+
     // Properties
 
     get recommendedRelays() {