From: Alexander Strange <astrange@ithinksw.com>
Date: Sun, 20 Apr 2003 21:47:57 +0000 (+0000)
Subject: Added more error checking. MT no longer crashes when you "Show iTunes", but I still... 
X-Git-Tag: v0.1~25
X-Git-Url: http://git.ithinksw.org/ITFoundation.git/commitdiff_plain/32340246be408a32469e529da2363a4a142121ed

Added more error checking. MT no longer crashes when you "Show iTunes", but I still need to fix the malformed AEs.
---

diff --git a/ITAppleEventCenter.m b/ITAppleEventCenter.m
index 888b1a5..c02d09c 100755
--- a/ITAppleEventCenter.m
+++ b/ITAppleEventCenter.m
@@ -117,7 +117,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     Size resultSize, charResultSize;
 
     AEBuildError buildError;
-    OSStatus err;
+    OSStatus berr,err;
     OSErr err2, err3;
     
 	if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
@@ -127,17 +127,17 @@ static ITAppleEventCenter *_sharedAECenter = nil;
 	
     //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+	NSLog(@"sending...");
+    if (!berr) [self printCarbonDesc:&sendEvent];
 
-    //[self printCarbonDesc:&sendEvent];
-
-    if (err) {
+    if (berr) {
         //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
-
-    //[self printCarbonDesc:&replyEvent];
+    NSLog(@"replying...");
+    if (!err) [self printCarbonDesc:&replyEvent];
 
     if (err) {
         //NSLog(@"Send Error: %i",err);
@@ -161,8 +161,8 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         free(result);
     }
 
-    AEDisposeDesc(&sendEvent);
-    AEDisposeDesc(&replyEvent);
+    if (!berr) AEDisposeDesc(&sendEvent);
+    if (!err) AEDisposeDesc(&replyEvent);
 
     return _finalString;
 }
diff --git a/ITInetServerSocket.m b/ITInetServerSocket.m
index 7d4a8f0..8fd8c54 100755
--- a/ITInetServerSocket.m
+++ b/ITInetServerSocket.m
@@ -17,8 +17,6 @@
 #import <fcntl.h>
 #import <unistd.h>
 
-/* Too bad Objective-C doesn't have class variables... */
-
 @interface ITInetServerSocket(Private)
 -(short)lookupPortForServiceType:(NSString*)name;
 -(void)setupConnection;