vlc | branch: master | Felix Paul Kühne <[email protected]> | Sun Aug 31 23:49:57 2014 +0200| [496c2575e067edc195227380c41ed69016df36bb] | committer: Felix Paul Kühne
macosx: fix mediainfo appearance on future OS X releases (close #12066) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=496c2575e067edc195227380c41ed69016df36bb --- modules/gui/macosx/intf.m | 4 +++- modules/gui/macosx/playlistinfo.m | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index a931573..29e2156 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -611,7 +611,6 @@ static VLCMain *_o_sharedMainInstance = nil; o_open = [[VLCOpen alloc] init]; o_coredialogs = [[VLCCoreDialogProvider alloc] init]; - o_info = [[VLCInfo alloc] init]; o_mainmenu = [[VLCMainMenu alloc] init]; o_coreinteraction = [[VLCCoreInteraction alloc] init]; o_eyetv = [[VLCEyeTVController alloc] init]; @@ -1644,6 +1643,9 @@ static bool f_appExit = false; - (id)info { + if (!o_info) + o_info = [[VLCInfo alloc] init]; + if (! nib_info_loaded) nib_info_loaded = [NSBundle loadNibNamed:@"MediaInfo" owner: NSApp]; diff --git a/modules/gui/macosx/playlistinfo.m b/modules/gui/macosx/playlistinfo.m index 0e2cd2f..bbf00ba 100644 --- a/modules/gui/macosx/playlistinfo.m +++ b/modules/gui/macosx/playlistinfo.m @@ -65,7 +65,6 @@ static VLCInfo *_o_sharedInstance = nil; - (void)awakeFromNib { [o_info_window setExcludedFromWindowsMenu: YES]; - [o_info_window setFloatingPanel: NO]; if (!OSX_SNOW_LEOPARD) [o_info_window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary]; @@ -115,7 +114,6 @@ static VLCInfo *_o_sharedInstance = nil; [o_lost_abuffers_lbl setStringValue: _NS("Lost buffers")]; [o_info_window setInitialFirstResponder: o_uri_txt]; - [o_info_window setDelegate: self]; b_awakeFromNib = YES; @@ -153,7 +151,7 @@ static VLCInfo *_o_sharedInstance = nil; NSInteger i_level = [[[VLCMain sharedInstance] voutController] currentStatusWindowLevel]; [o_info_window setLevel: i_level]; - [o_info_window makeKeyAndOrderFront: self]; + [o_info_window makeKeyAndOrderFront:nil]; } - (void)initMediaPanelStats _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
