Changeset 6315

Timestamp:

06/16/08 09:26:35 (4 months ago)

Author:

eugene

Message:

Fixed user addition algorithm.

Files:

• trunk/qt4-gui/src/dialogs/adduserdlg.cpp (modified) (2 diffs)

trunk/qt4-gui/src/dialogs/adduserdlg.cpp

@@ -99 +99 @@
   if (!id.isEmpty())
   {
-    ICQUser* u = gUserManager.FetchUser(id, ppid, LOCK_W);
+    ICQUser* u = gUserManager.FetchUser(id, ppid, LOCK_R);
 
     if (u == NULL)
-      added = gLicqDaemon->AddUserToList(id, ppid);
+      added = gLicqDaemon->AddUserToList(id, ppid, true, false, group);
     else
     {
       if (u->NotInList())
       {
+        u->Unlock();
+        gUserManager.SetUserInGroup(id, ppid, GROUPS_USER, group, true, true);
+        u->Lock(LOCK_W);
         u->SetPermanent();
         added = true;
@@ -114 +117 @@
   }
 
-  if (added)
-  {
-    gUserManager.SetUserInGroup(id, ppid, GROUPS_USER, group, true, true);
-    if (notify && ppid == LICQ_PPID)
-      gLicqDaemon->icqAlertUser(id, ppid);
-  }
+  if (added && notify)
+    gLicqDaemon->icqAlertUser(id, ppid);
 
   close();