Fix display of expanded netsplit events

irccloud · Nov 22, 2013 · bb84804 · bb84804
1 parent a8d1bad
commit bb84804
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/IRCCloud/Classes/CollapsedEvents.m b/IRCCloud/Classes/CollapsedEvents.m
@@ -224,6 +224,7 @@ -(void)addCollapsedEvent:(CollapsedEvent *)event {
                     e.type = kCollapsedEventPopIn;
                 }
                 e.eid = event.eid;
+                e.netsplit = event.netsplit;
                 [event copyModes:e];
             } else {
                 [_data addObject:event];
@@ -341,7 +342,7 @@ -(BOOL)addEvent:(Event *)event {
                             if(event.type == kCollapsedEventNetSplit && [event.msg isEqualToString:event.msg])
                                 match = YES;
                         }
-                        if(!match) {
+                        if(!match && _data.count > 0) {
                             CollapsedEvent *e = [[CollapsedEvent alloc] init];
                             e.type = kCollapsedEventNetSplit;
                             e.msg = event.msg;
@@ -435,6 +436,7 @@ -(NSString *)collapse:(BOOL)showChan {
                     break;
             }
         } else {
+            BOOL isNetsplit = NO;
             [_data sortUsingSelector:@selector(compare:)];
             NSEnumerator *i = [_data objectEnumerator];
             CollapsedEvent *last = nil;
@@ -448,7 +450,7 @@ -(NSString *)collapse:(BOOL)showChan {
 
                 do {
                     next = [i nextObject];
-                } while(next.netsplit);
+                } while(isNetsplit && next.netsplit);
 
                 if(message.length > 0 && e.type < kCollapsedEventNickChange && ((next == nil || next.type != e.type) && last != nil && last.type == e.type)) {
 					if(groupcount == 1) {
@@ -461,6 +463,8 @@ -(NSString *)collapse:(BOOL)showChan {
                 if(last == nil || last.type != e.type) {
                     switch(e.type) {
                         case kCollapsedEventNetSplit:
+                            isNetsplit = YES;
+                            NSLog(@"Netsplit");
                             break;
                         case kCollapsedEventMode:
                             if(message.length)