macosx: Make sure the o_info object gets released even if the nib has not been loaded.

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 3dbe618f44efe2705b59286b67501d4eaa9916e6..718a83bdab36dab8468b8d4ebe648b493d19efdf 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -93,6 +93,7 @@ struct intf_sys_t
  * VLCMain interface
  *****************************************************************************/
 @class AppleRemote;
+@class VLCInformation;
 @interface VLCMain : NSObject
 {
     intf_thread_t *p_intf;      /* The main intf object */
@@ -105,7 +106,7 @@ struct intf_sys_t
     id o_bookmarks;             /* VLCBookmarks   */
     id o_embedded_list;         /* VLCEmbeddedList*/
     id o_interaction_list;      /* VLCInteractionList*/
-    id o_info;                  /* VLCInformation */
+    VLCInformation * o_info;                  /* VLCInformation */
 #ifdef UPDATE_CHECK
     id o_update;                /* VLCUpdate      */
 #endif

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 43ff84bd00cb614519516cf76d368f5466238dce..459ca86c22fcfc14a88058deceac9b2f25ab8bce 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1751,9 +1751,9 @@ end:
     if( nib_bookmarks_loaded )
         [o_bookmarks release];
 
-    if( nib_info_loaded )
+    if( o_info )
     {
-        [o_info stop];
+        [o_info stopTimers];
         [o_info release];
     }
 

diff --git a/modules/gui/macosx/playlistinfo.h b/modules/gui/macosx/playlistinfo.h
index 82cb58223b39cdd61979c4b71383cd3f1b73c6d3..713810785424c59e14642ee4bb76c36b055da16e 100644 (file)
--- a/modules/gui/macosx/playlistinfo.h
+++ b/modules/gui/macosx/playlistinfo.h
@@ -102,6 +102,8 @@
 }
 
 - (void)initPanel;
+- (void)stopTimers;
+
 - (IBAction)metaFieldChanged:(id)sender;
 - (IBAction)saveMetaData:(id)sender;
 - (void)initMediaPanelStats;

diff --git a/modules/gui/macosx/playlistinfo.m b/modules/gui/macosx/playlistinfo.m
index c0dfa25714ee615bbf6e909174873483ae1466c3..858d55c15929a8ace418421bc86fc6106c20d428 100644 (file)
--- a/modules/gui/macosx/playlistinfo.m
+++ b/modules/gui/macosx/playlistinfo.m
@@ -119,7 +119,7 @@ static VLCInfo *_o_sharedInstance = nil;
     [self updatePanelWithItem:p_item];
 }
 
-- (void)stop
+- (void)stopTimers
 {
     /* make sure that the timer is released in any case */
     if( o_statUpdateTimer && [o_statUpdateTimer isValid] )