Changeset 6324

Show
Ignore:
Timestamp:
06/17/08 03:43:21 (6 months ago)
Author:
flynd
Message:

Make sure it's not a system group before we check server group for user.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/licq/src/user.cpp

    r6306 r6324  
    15581558    GroupType groupType, unsigned short groupId, bool inGroup, bool updateServer) 
    15591559{ 
     1560  // User group 0 is invalid and system group 0 is All Users 
     1561  if (groupId == 0) 
     1562    return; 
     1563 
    15601564  ICQUser* u = gUserManager.FetchUser(id, ppid, LOCK_W); 
    15611565  if (u == NULL) 
    … …  
    15641568  int gsid = u->GetGSID(); 
    15651569 
    1566   if (!inGroup && u->GetSID() != 0 && GetGroupFromID(gsid) == groupId) 
     1570  if (groupType == GROUPS_USER && !inGroup && u->GetSID() != 0 && GetGroupFromID(gsid) == groupId) 
    15671571  { 
    15681572    // Don't remove user from local group if member of the same server group