Commit 4ad2f8dc authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

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

parent a3694386
......@@ -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
......
......@@ -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];
}
......
......@@ -102,6 +102,8 @@
}
- (void)initPanel;
- (void)stopTimers;
- (IBAction)metaFieldChanged:(id)sender;
- (IBAction)saveMetaData:(id)sender;
- (void)initMediaPanelStats;
......
......@@ -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] )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment