From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Sun, 7 Jun 2009 21:38:30 +0000 (+0200)
Subject: Fixes Bug #711 - missing nicks after changing channelmodes (op, voice,...)
X-Git-Tag: 0.4.3~13
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=172c8f1cfa164852bda7f0112fed2b0fa52c902f;ds=sidebyside

Fixes Bug #711 - missing nicks after changing channelmodes (op, voice,...)
---

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 8394fefd..23ab2616 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -107,6 +107,23 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) {
   }
 
   newChild(bufferItem);
+
+  // postprocess... this is necessary because Qt doesn't seem to like adding childs which already have childs on their own
+  switch(bufferInfo.type()) {
+  case BufferInfo::ChannelBuffer:
+    {
+      ChannelBufferItem *channelBufferItem = static_cast<ChannelBufferItem *>(bufferItem);
+      if(_network) {
+        IrcChannel *ircChannel = _network->ircChannel(bufferInfo.bufferName());
+        if(ircChannel)
+          channelBufferItem->attachIrcChannel(ircChannel);
+      }
+    }
+    break;
+  default:
+    break;
+  }
+
   return bufferItem;
 }
 
@@ -436,13 +453,6 @@ ChannelBufferItem::ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeI
   : BufferItem(bufferInfo, parent),
     _ircChannel(0)
 {
-  const Network *net = Client::network(bufferInfo.networkId());
-  if(!net)
-    return;
-
-  IrcChannel *ircChannel = net->ircChannel(bufferInfo.bufferName());
-  if(ircChannel)
-    attachIrcChannel(ircChannel);
 }
 
 QVariant ChannelBufferItem::data(int column, int role) const {