]> git.sesse.net Git - vlc/commitdiff
macosx: fix mediainfo appearance on future OS X releases (close #12066)
authorFelix Paul Kühne <fkuehne@videolan.org>
Sun, 31 Aug 2014 21:49:57 +0000 (23:49 +0200)
committerFelix Paul Kühne <fkuehne@videolan.org>
Sun, 31 Aug 2014 21:49:57 +0000 (23:49 +0200)
modules/gui/macosx/intf.m
modules/gui/macosx/playlistinfo.m

index a93157333f3605e78789b7e2f0c2f231386efe6b..29e2156e923b9319cd018f5f37dca4424e2489be 100644 (file)
@@ -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];
 
index 0e2cd2fbefba4cf76b9497c17359fe8c775f0be9..bbf00ba752110720bbe4d03381751ed434ae571c 100644 (file)
@@ -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