[vlc-commits] macosx: hide the playlist without option click when showing the video in a separate window (refs #6213)

Felix Paul Kühne git at videolan.org
Thu Mar 1 19:06:30 CET 2012


vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Mar  1 19:01:50 2012 +0100| [dbc2db4a36f99ac8bda0e5ea4323f499c29c65a6] | committer: Felix Paul Kühne

macosx: hide the playlist without option click when showing the video in a separate window (refs #6213)
(cherry picked from commit 566b0cd4405f9c9022789ce43c86ec5ee4753acf)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=dbc2db4a36f99ac8bda0e5ea4323f499c29c65a6
---

 modules/gui/macosx/MainWindow.m |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 08bd195..326fedf 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -590,7 +590,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
 - (IBAction)togglePlaylist:(id)sender
 {
-    if ((([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0) && !b_splitview_removed)
+    if ( ((([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0) && !b_splitview_removed) || (b_nonembedded && [[VLCMain sharedInstance] activeVideoPlayback] && sender != nil) )
     {
         [self hideSplitView];
     }



More information about the vlc-commits mailing list