Changeset 9301

Timestamp:

Oct 12, 2009, 12:19:04 AM (13 years ago)

Author:

livings124

Message:

don't zoom the QL window if the main window's closed

Location:

trunk/macosx

Files:

• Controller.m (modified) (5 diffs)
• InfoWindowController.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -736 +736 @@
     [fAutoImportedNames release];
     [fPendingTorrentDownloads release];
+    
+    [fPreviewPanel release];
     
     //complete cleanup
@@ -1518 +1520 @@
         [fInfoController close];
     else
-    {        
+    {
         [fInfoController updateInfoStats];
         [[fInfoController window] orderFront: nil];
@@ -1524 +1526 @@
         if ([fInfoController canQuickLook]
             && [QLPreviewPanelSL sharedPreviewPanelExists] && [[QLPreviewPanelSL sharedPreviewPanel] isVisible])
-        [[QLPreviewPanelSL sharedPreviewPanel] reloadData];
+            [[QLPreviewPanelSL sharedPreviewPanel] reloadData];
         
     }
@@ -1533 +1535 @@
     [fInfoController setInfoForTorrents: [fTableView selectedTorrents]];
     
-    if ([NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanelSL sharedPreviewPanelExists] && [[QLPreviewPanelSL sharedPreviewPanel] isVisible])
+    if ([NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanelSL sharedPreviewPanelExists]
+        && [[QLPreviewPanelSL sharedPreviewPanel] isVisible])
         [[QLPreviewPanelSL sharedPreviewPanel] reloadData];
 }
@@ -3187 +3190 @@
     else
     {
+        if (![fWindow isVisible])
+            return NSZeroRect;
+        
         const NSInteger row = [fTableView rowForItem: item];
         if (row == -1)

trunk/macosx/InfoWindowController.m

@@ -1146 +1146 @@
 - (BOOL) canQuickLook
 {
-    if (fCurrentTabTag != TAB_FILES_TAG || ![[self window] isVisible] || ![NSApp isOnSnowLeopardOrBetter])
-        return NO;
-    
-    if ([fTorrents count] != 1)
+    if (fCurrentTabTag != TAB_FILES_TAG || ![[self window] isVisible] || [fTorrents count] != 1 || ![NSApp isOnSnowLeopardOrBetter])
         return NO;