Fix: Some bugs in macOS MAS

ollm · Dec 8, 2023 · 0fd6dd8 · 0fd6dd8
1 parent 161a84c
commit 0fd6dd8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/scripts/drag-and-drop.js b/scripts/drag-and-drop.js
@@ -119,7 +119,7 @@ function handleDrop(event)
 function start()
 {
 	// Currently the drop event does not return securityScopedBookmarks in macOS MAS, so this would not work correctly https://github.com/electron/electron/issues/40678
-	if(!macosMAS) return;
+	if(macosMAS) return;
 
 	app.event(window, 'dragenter', showDropZone);
 	app.event(window, 'dragleave', hideDropZone);

diff --git a/scripts/file-manager.js b/scripts/file-manager.js
@@ -635,8 +635,12 @@ var file = function(path) {
 
 				if(bookmark)
 				{
-					this.macosScopedResources.push(electronRemote.app.startAccessingSecurityScopedResource(bookmark));
-					break;
+					try
+					{
+						this.macosScopedResources.push(electronRemote.app.startAccessingSecurityScopedResource(bookmark));
+						break;
+					}
+					catch {}
 				}
 
 				segments.pop();
@@ -2288,8 +2292,12 @@ var fileCompressed = function(path, _realPath = false, forceType = false, prefix
 
 				if(bookmark)
 				{
-					this.macosScopedResources.push(electronRemote.app.startAccessingSecurityScopedResource(bookmark));
-					break;
+					try
+					{
+						this.macosScopedResources.push(electronRemote.app.startAccessingSecurityScopedResource(bookmark));
+						break;
+					}
+					catch {}
 				}
 
 				segments.pop();