Releasing the connection data if there is an error. Should now properly remove tracks...

diff --git a/AudioscrobblerController.m b/AudioscrobblerController.m
index 3864a0c..47b4a8b 100644 (file)
--- a/AudioscrobblerController.m
+++ b/AudioscrobblerController.m
@@ -222,6 +222,11 @@ static AudioscrobblerController *_sharedController = nil;
        [requestString release];
        [request release];
        
+       //For now we're not going to cache results, as it is less of a headache
+       //[_tracks removeObjectsInArray:_submitTracks];
+       [_tracks removeAllObjects];
+       [_submitTracks removeAllObjects];
+       
        //If we have tracks left, submit again after the interval seconds
 }
 
@@ -236,6 +241,7 @@ static AudioscrobblerController *_sharedController = nil;
 
 - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
 {
+       [_responseData release];
        [_lastStatus release];
        _lastStatus = [[NSString stringWithFormat:NSLocalizedString(@"audioscrobbler_error", @"Error - %@"), [error localizedDescription]] retain];
        [[NSNotificationCenter defaultCenter] postNotificationName:@"AudioscrobblerStatusChanged" object:self userInfo:[NSDictionary dictionaryWithObject:_lastStatus forKey:@"StatusString"]];
@@ -290,10 +296,6 @@ static AudioscrobblerController *_sharedController = nil;
                        //We have a protocol error
                }
        } else if (_currentStatus == AudioscrobblerSubmittingTracksStatus) {
-               //For now we're not going to cache results, as it is less of a headache
-               [_tracks removeObjectsInArray:_submitTracks];
-               [_submitTracks removeAllObjects];
-               
                if ([responseAction isEqualToString:@"OK"]) {
                        ITDebugLog(@"Audioscrobbler: Submission successful, clearing queue.");
                        /*[_tracks removeObjectsInArray:_submitTracks];

diff --git a/MenuTunes.xcodeproj/project.pbxproj b/MenuTunes.xcodeproj/project.pbxproj
index 6ae44ed..9831577 100755 (executable)
--- a/MenuTunes.xcodeproj/project.pbxproj
+++ b/MenuTunes.xcodeproj/project.pbxproj
@@ -124,28 +124,28 @@
                        isa = PBXContainerItemProxy;
                        containerPortal = 7C505D290801F0C700017AF9 /* ITMac.xcodeproj */;
                        proxyType = 1;
-                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216 /* ITMac */;
+                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
                        remoteInfo = ITMac;
                };
                7C2A885A092266FA007A4F41 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 7C505D2D0801F0D100017AF9 /* ITFoundation.xcodeproj */;
                        proxyType = 1;
-                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216 /* ITFoundation */;
+                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
                        remoteInfo = ITFoundation;
                };
                7C2A885E09226713007A4F41 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 7C505D2D0801F0D100017AF9 /* ITFoundation.xcodeproj */;
                        proxyType = 1;
-                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216 /* ITFoundation */;
+                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
                        remoteInfo = ITFoundation;
                };
                7C2A886009226716007A4F41 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 7C505D290801F0C700017AF9 /* ITMac.xcodeproj */;
                        proxyType = 1;
-                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216 /* ITMac */;
+                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
                        remoteInfo = ITMac;
                };
                7C331FF205A9253F0088905B /* PBXContainerItemProxy */ = {
@@ -756,6 +756,10 @@
                        mainGroup = 29B97314FDCFA39411CA2CEA /* MenuTunes */;
                        projectDirPath = "";
                        projectReferences = (
+                               {
+                                       ProductGroup = 7C505D330801F0F000017AF9 /* Products */;
+                                       ProjectRef = 7C505D2D0801F0D100017AF9 /* ITFoundation.xcodeproj */;
+                               },
                                {
                                        ProductGroup = 7C505D370801F0F000017AF9 /* Products */;
                                        ProjectRef = 7C505D250801F0BE00017AF9 /* ITKit.xcodeproj */;
@@ -764,10 +768,6 @@
                                        ProductGroup = 7C505D350801F0F000017AF9 /* Products */;
                                        ProjectRef = 7C505D290801F0C700017AF9 /* ITMac.xcodeproj */;
                                },
-                               {
-                                       ProductGroup = 7C505D330801F0F000017AF9 /* Products */;
-                                       ProjectRef = 7C505D2D0801F0D100017AF9 /* ITFoundation.xcodeproj */;
-                               },
                        );
                        targets = (
                                8D1107260486CEB800E47090 /* MenuTunes */,

diff --git a/libValidate.a b/libValidate.a
index aa76b86..d241364 100755 (executable)
Binary files a/libValidate.a and b/libValidate.a differ