Changeset 9302 for trunk/macosx/Controller.m

Timestamp:

Oct 12, 2009, 12:48:16 AM (13 years ago)

Author:

livings124

Message:

fix a crash on quit with the QuickLook? window open

File:

• trunk/macosx/Controller.m (modified) (4 diffs)

trunk/macosx/Controller.m

@@ -333 +333 @@
         fPrefsController = [[PrefsController alloc] init];
         
+        fQuitting = NO;
         fSoundPlaying = NO;
         
@@ -666 +667 @@
 - (void) applicationWillTerminate: (NSNotification *) notification
 {
+    fQuitting = YES;
+    
     //stop the Bonjour service
     [[BonjourController defaultController] stop];
@@ -704 +707 @@
     const BOOL quickLookOpen = [NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanelSL sharedPreviewPanelExists]
                                 && [[QLPreviewPanelSL sharedPreviewPanel] isVisible];
+    if (quickLookOpen)
+        [[QLPreviewPanelSL sharedPreviewPanel] updateController];
+    
     for (NSWindow * window in [NSApp windows])
-    {
-        if (!quickLookOpen || window != [QLPreviewPanelSL sharedPreviewPanel]) //hide quicklook window last to avoid animation
-            [window orderOut: nil];
-    }
-    
-    if (quickLookOpen)
-    {
-        [[QLPreviewPanelSL sharedPreviewPanel] reloadData];
-        [[QLPreviewPanelSL sharedPreviewPanel] orderOut: nil];
-    }
+        [window orderOut: nil];
     
     [self showStatusBar: NO animate: NO];
@@ -3129 +3126 @@
 - (BOOL) acceptsPreviewPanelControl: (id) panel
 {
-    return YES;
+    return !fQuitting;
 }