[vlc-commits] macosx: fixed potential race condition
Felix Paul Kühne
git at videolan.org
Wed Aug 22 17:46:46 CEST 2012
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Aug 22 17:46:24 2012 +0200| [1de6f93432e1be15cd58966f951f27fd543e9fb5] | committer: Felix Paul Kühne
macosx: fixed potential race condition
items stored in a xib should only interacted with after its loaded, which may be after NSApp is
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1de6f93432e1be15cd58966f951f27fd543e9fb5
---
modules/gui/macosx/intf.m | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index a54140d..02bb652 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -654,6 +654,13 @@ static VLCMain *_o_sharedMainInstance = nil;
[[VLCApplication sharedApplication] setApplicationIconImage: [NSImage imageNamed:@"vlc-xmas"]];
}
+ [o_mainwindow updateWindow];
+ [o_mainwindow updateTimeSlider];
+ [o_mainwindow updateVolumeSlider];
+ [o_mainwindow makeKeyAndOrderFront: self];
+
+ [self initStrings];
+
nib_main_loaded = TRUE;
}
@@ -663,11 +670,6 @@ static VLCMain *_o_sharedMainInstance = nil;
[self updateCurrentlyUsedHotkeys];
- [o_mainwindow updateWindow];
- [o_mainwindow updateTimeSlider];
- [o_mainwindow updateVolumeSlider];
- [o_mainwindow makeKeyAndOrderFront: self];
-
/* init media key support */
b_mediaKeySupport = var_InheritBool( VLCIntf, "macosx-mediakeys" );
if( b_mediaKeySupport )
@@ -690,7 +692,6 @@ static VLCMain *_o_sharedMainInstance = nil;
/* we will need this, so let's load it here so the interface appears to be more responsive */
nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner: NSApp];
- [self initStrings];
}
- (void)initStrings
More information about the vlc-commits
mailing list