[vlc-commits] macosx: don' t allow option-click on the playlist button in case a video is playing

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:05:21 2012 +0100| [6f30aac6f5333ac40f3bd45f585c0eab0a3d8deb] | committer: Felix Paul Kühne

macosx: don't allow option-click on the playlist button in case a video is playing
(cherry picked from commit e6f14b002b2232794d9dfc4a2841d2ea1df2241f)

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

 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 326fedf..99775aa 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) || (b_nonembedded && [[VLCMain sharedInstance] activeVideoPlayback] && sender != nil) )
+    if ( ((([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0) && !b_splitview_removed && ![[VLCMain sharedInstance] activeVideoPlayback]) || (b_nonembedded && [[VLCMain sharedInstance] activeVideoPlayback] && sender != nil) )
     {
         [self hideSplitView];
     }



More information about the vlc-commits mailing list