From 6cd95dbc8ac28ab7a22e640d9fe6e3a6aff8f8a9 Mon Sep 17 00:00:00 2001
From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Mon, 21 Jan 2008 19:09:54 +0000
Subject: [PATCH] fixed a bug with where nicks where not shown in the right
 category

---
 src/client/networkmodel.cpp | 5 ++---
 version.inc                 | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 227382b9..4c824182 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -191,7 +191,6 @@ void BufferItem::part(IrcUser *ircUser) {
 
 void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
   UserCategoryItem *categoryItem = 0;
-  IrcUserItem *userItem;
   for(int i = 0; i < childCount(); i++) {
     categoryItem = qobject_cast<UserCategoryItem *>(child(i));
     categoryItem->removeChildById((quint64)ircUser);
@@ -202,10 +201,10 @@ void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
 
 void BufferItem::userModeChanged(IrcUser *ircUser) {
   Q_ASSERT(_ircChannel);
-    
+
   UserCategoryItem *categoryItem;
   int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
-  if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))))
+  if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser)))
     return; // already in the right category;
   
   removeUserFromCategory(ircUser);
diff --git a/version.inc b/version.inc
index 4b1435da..70f85d4a 100644
--- a/version.inc
+++ b/version.inc
@@ -5,7 +5,7 @@
 
   quasselVersion = "0.2.0-pre";
   quasselDate = "2008-01-21";
-  quasselBuild = 368;
+  quasselBuild = 370;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 358;
-- 
2.20.1