From 8766f02049a166e09a15f420999f3136aa4aabaf Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Mon, 24 Dec 2007 16:18:09 +0000
Subject: [PATCH] set up message log in tr_initFull

---
 macosx/Controller.m              |  4 +++-
 macosx/MessageWindowController.m | 23 +++++++++--------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 4d1558b84..075697dbe 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -203,7 +203,9 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
                         -1, /* reset in prefs */
                         FALSE, /* reset in prefs */
                         -1, /* reset in prefs */
-                        [fDefaults integerForKey: @"PeersGlobal"]);
+                        [fDefaults integerForKey: @"PeersGlobal"],
+                        [fDefaults integerForKey: @"MessageLevel"],
+                        YES);
         
         [NSApp setDelegate: self];
         
diff --git a/macosx/MessageWindowController.m b/macosx/MessageWindowController.m
index 5ca7857ac..f1681ec32 100644
--- a/macosx/MessageWindowController.m
+++ b/macosx/MessageWindowController.m
@@ -44,17 +44,7 @@
 
 - (id) init
 {
-    if ((self = [super initWithWindowNibName: @"MessageWindow"]))
-    {
-        fMessages = [[NSMutableArray alloc] init];
-        
-        fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self
-                    selector: @selector(updateLog:) userInfo: nil repeats: YES];
-        
-        tr_setMessageLevel([[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"]);
-        tr_setMessageQueuing(1);
-    }
-    return self;
+    return [super initWithWindowNibName: @"MessageWindow"];
 }
 
 - (void) dealloc
@@ -67,8 +57,14 @@
     [super dealloc];
 }
 
+#warning don't update when the window is closed
 - (void) awakeFromNib
 {
+    fMessages = [[NSMutableArray alloc] init];
+        
+    fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self
+                selector: @selector(updateLog:) userInfo: nil repeats: YES];
+    
     NSWindow * window = [self window];
     [window setFrameAutosaveName: @"MessageWindowFrame"];
     [window setFrameUsingName: @"MessageWindowFrame"];
@@ -78,11 +74,8 @@
     
     //initially sort peer table by IP
     if ([[fMessageTable sortDescriptors] count] == 0)
-    {
         [fMessageTable setSortDescriptors: [NSArray arrayWithObject: [[fMessageTable tableColumnWithIdentifier: @"Date"]
                                             sortDescriptorPrototype]]];
-        [self updateLog: nil];
-    }
     
     fErrorImage = [NSImage imageNamed: @"RedDot.png"];
     fInfoImage = [NSImage imageNamed: @"YellowDot.png"];
@@ -106,6 +99,8 @@
         case TR_MSG_DBG:
             [fLevelButton selectItemAtIndex: LEVEL_DEBUG];
     }
+    
+    [self updateLog: nil];
 }
 
 - (void) updateLog: (NSTimer *) timer