[vlc-commits] macosx: Remove usage of outdated xib loading in playlist panel

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sat Jun  9 20:46:14 2018 +0200| [80c156985888802fe5cb62c76582f4ee6a612ef8] | committer: David Fuhrmann

macosx: Remove usage of outdated xib loading in playlist panel

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

 modules/gui/macosx/VLCMainMenu.h | 2 +-
 modules/gui/macosx/VLCMainMenu.m | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/VLCMainMenu.h b/modules/gui/macosx/VLCMainMenu.h
index 926604d474..24d559ba7e 100644
--- a/modules/gui/macosx/VLCMainMenu.h
+++ b/modules/gui/macosx/VLCMainMenu.h
@@ -205,7 +205,7 @@
 @property (readwrite, weak) IBOutlet NSMenuItem *voutMenufullscreen;
 @property (readwrite, weak) IBOutlet NSMenuItem *voutMenusnapshot;
 
- at property (readwrite, weak) IBOutlet NSView *playlistSaveAccessoryView;
+ at property (readwrite, strong) IBOutlet NSView *playlistSaveAccessoryView;
 @property (readwrite, weak) IBOutlet NSPopUpButton *playlistSaveAccessoryPopup;
 @property (readwrite, weak) IBOutlet NSTextField *playlistSaveAccessoryText;
 
diff --git a/modules/gui/macosx/VLCMainMenu.m b/modules/gui/macosx/VLCMainMenu.m
index 481d2bc390..cc1f088c7a 100644
--- a/modules/gui/macosx/VLCMainMenu.m
+++ b/modules/gui/macosx/VLCMainMenu.m
@@ -1151,7 +1151,10 @@
     NSSavePanel *savePanel = [NSSavePanel savePanel];
     NSString * name = [NSString stringWithFormat: @"%@", _NS("Untitled")];
 
-    [NSBundle loadNibNamed:@"PlaylistAccessoryView" owner:self];
+    static dispatch_once_t once;
+    dispatch_once(&once, ^{
+        [[NSBundle mainBundle] loadNibNamed:@"PlaylistAccessoryView" owner:self topLevelObjects:nil];
+    });
 
     [_playlistSaveAccessoryText setStringValue: _NS("File Format:")];
     [[_playlistSaveAccessoryPopup itemAtIndex:0] setTitle: _NS("Extended M3U")];