[vlc-commits] macosx: fix race condition which caused hiding the main split view ( close #11103)

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Tue Apr 15 18:44:48 2014 +0200| [6ceee192b88dc85641a92b1ba7d84db782899590] | committer: David Fuhrmann

macosx: fix race condition which caused hiding the main split view (close #11103)

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

 modules/gui/macosx/VLCVoutWindowController.m |    1 +
 modules/gui/macosx/intf.m                    |    2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m
index 9d1e712..305b6eb 100644
--- a/modules/gui/macosx/VLCVoutWindowController.m
+++ b/modules/gui/macosx/VLCVoutWindowController.m
@@ -196,6 +196,7 @@
     [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
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 602b454..51b4433 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -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];