Changeset 9702 for trunk/macosx/MessageWindowController.m

Timestamp:

Dec 10, 2009, 5:25:12 AM (13 years ago)

Author:

livings124

Message:

fix a bug with the new message index code

File:

• trunk/macosx/MessageWindowController.m (modified) (3 diffs)

trunk/macosx/MessageWindowController.m

@@ -159 +159 @@
     [fLock lock];
     
-    NSUInteger currentCount = [fMessages count];
+    NSUInteger currentIndex = [fMessages count] > 0 ? [[[fMessages lastObject] objectForKey: @"Index"] unsignedIntegerValue] : 0;
     
     NSScroller * scroller = [[fMessageTable enclosingScrollView] verticalScroller];
-    const BOOL shouldScroll = currentCount == 0 || [scroller floatValue] == 1.0 || [scroller isHidden]
+    const BOOL shouldScroll = currentIndex == 0 || [scroller floatValue] == 1.0 || [scroller isHidden]
                                 || [scroller knobProportion] == 1.0;
     
@@ -179 +179 @@
                                     [NSString stringWithUTF8String: currentMessage->message], @"Message",
                                     [NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
-                                    [NSNumber numberWithUnsignedInteger: currentCount++], @"Index", //more accurate when sorting by date
+                                    [NSNumber numberWithUnsignedInteger: currentIndex++], @"Index", //more accurate when sorting by date
                                     [NSNumber numberWithInteger: currentMessage->level], @"Level",
                                     name, @"Name",
@@ -193 +193 @@
     }
     
-    if (currentCount > TR_MAX_MSG_LOG)
-    {
-        NSIndexSet * removeIndexes = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, currentCount-TR_MAX_MSG_LOG)];
+    if ([fMessages count] > TR_MAX_MSG_LOG)
+    {
+        NSIndexSet * removeIndexes = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fMessages count]-TR_MAX_MSG_LOG)];
         NSArray * itemsToRemove = [fMessages objectsAtIndexes: removeIndexes];