From c9e3322034ce3745f782069ad3d15c58e4b353c7 Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Wed, 13 Feb 2008 19:33:04 +0000
Subject: [PATCH] hopefully fix a crash with the open window

---
 macosx/AddWindowController.m     | 9 +++++++--
 macosx/MessageWindowController.m | 9 ++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/macosx/AddWindowController.m b/macosx/AddWindowController.m
index 6f10156b7..3d7f38c9e 100644
--- a/macosx/AddWindowController.m
+++ b/macosx/AddWindowController.m
@@ -200,7 +200,10 @@
     [fTimer invalidate];
     fTimer = nil;
     
+    [fFileController setTorrent: nil]; //avoid a crash when window tries to update
+    
     [fController askOpenConfirmed: self add: NO];
+    return YES;
 }
 
 - (void) verifyLocalData: (id) sender
@@ -240,8 +243,10 @@
     if ([fDeleteCheck state] == NSOnState)
         [fTorrent trashTorrent];
     
-    //ensure last, since it releases this controller
-    [fController askOpenConfirmed: self add: YES];
+    [fFileController setTorrent: nil]; //avoid a crash when window tries to update
+    
+    [self close];
+    [fController askOpenConfirmed: self add: YES]; //ensure last, since it releases this controller
 }
 
 - (void) folderChoiceClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) contextInfo
diff --git a/macosx/MessageWindowController.m b/macosx/MessageWindowController.m
index fa9a7f3c9..11e8872b4 100644
--- a/macosx/MessageWindowController.m
+++ b/macosx/MessageWindowController.m
@@ -116,13 +116,12 @@
     if ((messages = tr_getQueuedMessages()) == NULL)
         return;
     
-    NSMutableDictionary * message;
     for (currentMessage = messages; currentMessage != NULL; currentMessage = currentMessage->next)
     {
-        message  = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                    [NSString stringWithUTF8String: currentMessage->message], @"Message",
-                    [NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
-                    [NSNumber numberWithInt: currentMessage->level], @"Level", nil];
+        NSMutableDictionary * message  = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                                        [NSString stringWithUTF8String: currentMessage->message], @"Message",
+                                        [NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
+                                        [NSNumber numberWithInt: currentMessage->level], @"Level", nil];
         
         if (currentMessage->file != NULL)
         {