vlc | branch: master | Felix Paul Kühne <[email protected]> | Thu May 17 02:33:22 2012 +0200| [5c165066e19c1935de7abd8142deab531c0265ac] | committer: Felix Paul Kühne
macosx: fixed corner case, which could lead to an empty main window in case the video output closes prematurely > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5c165066e19c1935de7abd8142deab531c0265ac --- modules/gui/macosx/MainWindow.m | 3 ++- modules/gui/macosx/intf.m | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index 60e38a2..80535a4 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -727,7 +727,7 @@ static VLCMainWindow *_o_sharedInstance = nil; if( b_nativeFullscreenMode && b_fullscreen && b_activeVideo && sender != nil ) return; - if (b_dropzone_active && !b_activeVideo && ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0) + if (b_dropzone_active && ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0) { b_dropzone_active = NO; [self hideDropZone]; @@ -1148,6 +1148,7 @@ static VLCMainWindow *_o_sharedInstance = nil; - (void)hideDropZone { + b_dropzone_active = NO; [o_dropzone_view removeFromSuperview]; [[o_playlist_table animator] setHidden: NO]; } diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index a70592c..417b0b3 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -1741,7 +1741,7 @@ unsigned int CocoaKeyToVLC( unichar i_key ) b_active_videoplayback = b_value; if( o_mainwindow ) { - [o_mainwindow performSelectorOnMainThread:@selector(setVideoplayEnabled) withObject:nil waitUntilDone:NO]; + [o_mainwindow performSelectorOnMainThread:@selector(setVideoplayEnabled) withObject:nil waitUntilDone:YES]; [o_mainwindow performSelectorOnMainThread:@selector(togglePlaylist:) withObject:nil waitUntilDone:NO]; } } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
