[vlc-commits] macosx: move code line from VLCMain to VLCMainMenu since it belongs there

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Aug 24 19:58:08 2012 +0200| [2335e37034e3edbdc3560337c7dba6de6b5d8770] | committer: Felix Paul Kühne

macosx: move code line from VLCMain to VLCMainMenu since it belongs there

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

 modules/gui/macosx/MainMenu.m |    2 ++
 modules/gui/macosx/intf.m     |    3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index a417102..079b3c6 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -110,6 +110,8 @@ static VLCMainMenu *_o_sharedInstance = nil;
     if( o_mu_playlistTableColumnsContextMenu )
         [o_mu_playlistTableColumnsContextMenu release];
 
+    [self releaseRepresentedObjects:[NSApp mainMenu]];
+
     [super dealloc];
 }
 
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index e1fdf0e..7c168e3 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -822,9 +822,6 @@ static VLCMain *_o_sharedMainInstance = nil;
     /* write cached user defaults to disk */
     [[NSUserDefaults standardUserDefaults] synchronize];
 
-    /* Make sure the Menu doesn't have any references to vlc objects anymore */
-    //FIXME: this should be moved to VLCMainMenu
-    [o_mainmenu releaseRepresentedObjects:[NSApp mainMenu]];
     [o_mainmenu release];
 
     libvlc_Quit( p_intf->p_libvlc );