]> git.sesse.net Git - vlc/commitdiff
* forwardport [11483] to trunk
authorFelix Paul Kühne <fkuehne@videolan.org>
Mon, 20 Jun 2005 21:12:22 +0000 (21:12 +0000)
committerFelix Paul Kühne <fkuehne@videolan.org>
Mon, 20 Jun 2005 21:12:22 +0000 (21:12 +0000)
modules/gui/macosx/intf.m

index b3bff37f23bd5714ea06cf89cbad9f8f1a725d25..5e58cc188cb099ac74b2dc48a035511ac045de86 100644 (file)
@@ -1568,14 +1568,14 @@ static VLCMain *_o_sharedMainInstance = nil;
         if ( o_size_with_playlist.height > 200 )
         {
             o_rect.size.height = o_size_with_playlist.height;
-        }
-        else
-        {
+        } else {
             o_rect.size.height = 500;
         }
         
-        if ( o_rect.size.width == [o_window minSize].width )
+        if ( o_size_with_playlist.width > [o_window minSize].width )
         {
+            o_rect.size.width = o_size_with_playlist.width;
+        } else {
             o_rect.size.width = 500;
         }