Changeset 6339

Timestamp:

06/18/08 23:55:53 (2 months ago)

Author:

flynd

Message:

Fix for r6336. Group id might be higher than number of groups.

Files:

• trunk/qt4-gui/src/config/contactlist.cpp (modified) (1 diff)

trunk/qt4-gui/src/config/contactlist.cpp

@@ -74 +74 @@
   myGroupType = static_cast<GroupType>(groupType);
 
-  if ((myGroupType == GROUPS_USER && myGroupId > gUserManager.NumGroups()) ||
-      (myGroupType == GROUPS_SYSTEM && myGroupId >= NUM_GROUPS_SYSTEM_ALL) ||
-      (myGroupType != GROUPS_USER && myGroupType != GROUPS_SYSTEM))
+  // Check that the group actually exists
+  // Group "Other users" is not a real group in the daemon
+  if ((myGroupType != GROUPS_USER || myGroupId != 0) &&
+      !gUserManager.groupExists(myGroupType, myGroupId))
   {
     myGroupId = GROUP_ALL_USERS;