fix: win.closeFilePreview recreates panel when called twice (electron…

…#45319) * fix: close quick look during tests on macOS * use longer delay 🤷 * fix: sharedPreviewPanel being recreated on close * test: ensure preview panel gets closed
loongson · Feb 17, 2025 · 6be1151 · 6be1151
1 parent c0422d7
commit 6be1151
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
@@ -1596,8 +1596,11 @@ static bool FromV8(v8::Isolate* isolate,
 }
 
 void NativeWindowMac::CloseFilePreview() {
-  if ([QLPreviewPanel sharedPreviewPanelExists]) {
+  // Need to be careful about checking [QLPreviewPanel sharedPreviewPanel] as
+  // simply accessing it will cause it to reinitialize and reappear.
+  if ([QLPreviewPanel sharedPreviewPanelExists] && preview_item_) {
     [[QLPreviewPanel sharedPreviewPanel] close];
+    preview_item_ = nil;
   }
 }
 

diff --git a/spec/api-browser-window-spec.ts b/spec/api-browser-window-spec.ts
@@ -6256,6 +6256,7 @@ describe('BrowserWindow module', () => {
       w.previewFile(__filename);
       await setTimeout(500);
       expect(showCalled).to.equal(false, 'should not have called show twice');
+      w.closeFilePreview();
     });
   });