[vlc-commits] macosx: fixed wrong behavior of the drop zone introduced in [ 7f63022f8a94871fd6ca1be2c9c69660ff1d7f6e] (close #6071)

Felix Paul Kühne git at videolan.org
Fri Feb 17 09:19:55 CET 2012


vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Feb 17 09:15:22 2012 +0100| [2181994e0447b0c513b1d93b425af180cd7a4f46] | committer: Felix Paul Kühne

macosx: fixed wrong behavior of the drop zone introduced in [7f63022f8a94871fd6ca1be2c9c69660ff1d7f6e] (close #6071)
(cherry picked from commit a2bd73d9b1daeca20684fbc5687b21e1088c3001)

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

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

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index a543727..abda75f 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -562,11 +562,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
 - (IBAction)togglePlaylist:(id)sender
 {
-    if (b_dropzone_active)
+    if (b_dropzone_active && ![[VLCMain sharedInstance] activeVideoPlayback])
     {
         b_dropzone_active = NO;
         [self hideDropZone];
-        return;
     }
 
     if (!b_nonembedded)



More information about the vlc-commits mailing list