]> git.sesse.net Git - vlc/commitdiff
macosx: fix race condition which caused hiding the main split view (close #11103)
authorDavid Fuhrmann <dfuhrmann@videolan.org>
Tue, 15 Apr 2014 16:44:48 +0000 (18:44 +0200)
committerDavid Fuhrmann <dfuhrmann@videolan.org>
Tue, 15 Apr 2014 16:49:27 +0000 (18:49 +0200)
modules/gui/macosx/VLCVoutWindowController.m
modules/gui/macosx/intf.m

index 9d1e7124707528ab483a889abab9f1807a240b98..305b6ebf407ba4187d02ff96d8ecf27dfe88a483 100644 (file)
     [o_new_video_window setHasActiveVideo: YES];
     [o_vout_dict setObject:[o_new_video_window autorelease] forKey:[NSValue valueWithPointer:p_wnd]];
 
+    [[VLCMain sharedInstance] setActiveVideoPlayback: YES];
     [[VLCMainWindow sharedInstance] setNonembedded:!b_mainwindow_has_video];
 
     // beware of order, setActiveVideoPlayback:, setHasActiveVideo: and setNonembedded: must be called before
index 602b4548ba9afa03c8f24177acc0e7445baf5de9..51b44339738c3c4754827a946b58725dbdcfdc75 100644 (file)
@@ -135,8 +135,6 @@ int WindowOpen(vout_window_t *p_wnd, const vout_window_cfg_t *cfg)
         return VLC_EGENERIC;
     }
 
-    [[VLCMain sharedInstance] setActiveVideoPlayback: YES];
-
     SEL sel = @selector(setupVoutForWindow:withProposedVideoViewPosition:);
     NSInvocation *inv = [NSInvocation invocationWithMethodSignature:[o_vout_controller methodSignatureForSelector:sel]];
     [inv setTarget:o_vout_controller];