Fixed stupid crash.

[MenuTunes.git] / MenuTunes.m

diff --git a/MenuTunes.m b/MenuTunes.m
index 0227042..bcc5590 100755 (executable)
--- a/MenuTunes.m
+++ b/MenuTunes.m
@@ -15,6 +15,9 @@ Things to do:
     - going to need a different way of defining key combos
 ¥ Optimize, this thing is big and slow :(
 ¥ Apple Events! Apple Events! Apple Events!
     - going to need a different way of defining key combos
 ¥ Optimize, this thing is big and slow :(
 ¥ Apple Events! Apple Events! Apple Events!

+
+¥ I think I found a slight memory leak:
+    425 MenuTunes    7.8%  8:29.87   1    56  4827   215M+ 3.14M   135M-  599M+

 */
 
 #import "MenuTunes.h"
 */
 
 #import "MenuTunes.h"


@@ -155,6 +158,7 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
             [menu addItem:[NSMenuItem separatorItem]];
         }
     }
             [menu addItem:[NSMenuItem separatorItem]];
         }
     }

+    

     curTrackIndex = -1; //Force update of everything
     [self timerUpdate]; //Updates dynamic info in the menu
     
     curTrackIndex = -1; //Force update of everything
     [self timerUpdate]; //Updates dynamic info in the menu
     


@@ -400,6 +404,8 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
     buffer = malloc(length);
     
     AEGetDescData(&resultDesc, buffer, length);
     buffer = malloc(length);
     
     AEGetDescData(&resultDesc, buffer, length);

+    AEDisposeDesc(&scriptDesc);
+    AEDisposeDesc(&resultDesc);

     result = [NSString stringWithCString:buffer length:length];
     if (![result isEqualToString:@""] &&
         ([result characterAtIndex:0] == '\"') &&
     result = [NSString stringWithCString:buffer length:length];
     if (![result isEqualToString:@""] &&
         ([result characterAtIndex:0] == '\"') &&


@@ -416,15 +422,17 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
 - (void)timerUpdate
 {
     int pid;
 - (void)timerUpdate
 {
     int pid;

+    

     if (GetProcessPID(&iTunesPSN, &pid) == noErr)
     {
         int trackPlayingIndex = [[self runScriptAndReturnResult:@"return index of current track"] intValue];
     if (GetProcessPID(&iTunesPSN, &pid) == noErr)
     {
         int trackPlayingIndex = [[self runScriptAndReturnResult:@"return index of current track"] intValue];

+        

         if (trackPlayingIndex != curTrackIndex)
         {
             [self updateMenu];
             curTrackIndex = trackPlayingIndex;
         }
         if (trackPlayingIndex != curTrackIndex)
         {
             [self updateMenu];
             curTrackIndex = trackPlayingIndex;
         }

-        
+               

         //Update Play/Pause menu item
         if (playPauseMenuItem)
         {
         //Update Play/Pause menu item
         if (playPauseMenuItem)
         {