Changeset 9618

Timestamp:

Nov 28, 2009, 9:01:27 PM (12 years ago)

Author:

livings124

Message:

add a lock to the message lock code

Location:

trunk/macosx

Files:

• MessageWindowController.h (modified) (1 diff)
• MessageWindowController.m (modified) (6 diffs)

trunk/macosx/MessageWindowController.h

@@ -37 +37 @@
     
     NSTimer * fTimer;
+    
+    NSLock * fLock;
 }
 

trunk/macosx/MessageWindowController.m

@@ -51 +51 @@
 {
     [fTimer invalidate];
+    [fLock release];
+    
     [fMessages release];
     [fDisplayedMessages release];
@@ -124 +126 @@
     fMessages = [[NSMutableArray alloc] init];
     fDisplayedMessages = [[NSMutableArray alloc] init];
+    
+    fLock = [[NSLock alloc] init];
 }
 
@@ -147 +151 @@
     
     static NSUInteger currentIndex = 0;
+    
+    [fLock lock];
     
     NSScroller * scroller = [[fMessageTable enclosingScrollView] verticalScroller];
@@ -190 +196 @@
             [fMessageTable scrollRowToVisible: [fDisplayedMessages count]-1];
     }
+    
+    [fLock unlock];
 }
 
@@ -304 +312 @@
         return;
     
+    [fLock lock];
+    
     [[NSUserDefaults standardUserDefaults] setInteger: level forKey: @"MessageLevel"];
     
@@ -320 +330 @@
     [fMessageTable deselectAll: nil];
     [fMessageTable reloadData];
+    
+    [fLock unlock];
 }