* make sure that the timer which is updating the stats-tab is stopped when the panel...

* fixed a minor memory leak (the timer wasn't released after invalidating it)
* VLCInfo is o_info_window's delegate now

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
index bbff69cb9d22179f9ccd3f65731f2d8b6715829f..0bf4eb1d572810e2fb55fa1ecfb27cdfb9c01290 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/playlistinfo.m b/modules/gui/macosx/playlistinfo.m
index 67c3fe1fbdee4b7fed039fa47c56b6a8e3d0e19a..c09b181618bb45190a279a8c0d916c41c5a03e11 100644 (file)
--- a/modules/gui/macosx/playlistinfo.m
+++ b/modules/gui/macosx/playlistinfo.m
@@ -98,10 +98,19 @@
     [o_lost_abuffers_lbl setStringValue: _NS("Lost buffers")];
 }
 
+- (void)dealloc
+{
+    /* make that it is released in any case */
+    if ( o_statUpdateTimer )
+        [o_statUpdateTimer release];
+    [super dealloc];
+}
+
 - (IBAction)togglePlaylistInfoPanel:(id)sender
 {
     if( [o_info_window isVisible] )
     {
+        [self windowShouldClose: nil];
         [o_info_window orderOut: sender];
     }
     else
@@ -115,8 +124,7 @@
 {
     if( [o_info_window isVisible] )
     {
-        if( o_statUpdateTimer )
-            [o_statUpdateTimer invalidate];
+        [self windowShouldClose: nil];
         [o_info_window orderOut: sender];
     }
     else
@@ -268,6 +276,7 @@
 
 - (IBAction)infoCancel:(id)sender
 {
+    [self windowShouldClose: nil];
     [o_info_window orderOut: self];
 }
 
@@ -292,6 +301,7 @@
         var_Set( p_playlist, "intf-change", val );
     }
     vlc_object_release( p_playlist );
+    [self windowShouldClose: nil];
     [o_info_window orderOut: self];
 }
 
@@ -324,6 +334,16 @@
     return NO;
 }
 
+- (BOOL)windowShouldClose:(id)sender
+{
+    if( o_statUpdateTimer )
+    {
+        [o_statUpdateTimer invalidate];
+        [o_statUpdateTimer release];
+    }
+    return YES;
+}
+
 @end
 
 @implementation VLCInfo (NSMenuValidation)