Changeset 5994 for trunk/qt-gui

Timestamp:

01/07/08 22:47:27 (11 months ago)

Author:

eugene

Message:

Candidate fix for #1611.

Files:

• trunk/qt-gui/src/searchuserdlg.cpp (modified) (1 diff)

trunk/qt-gui/src/searchuserdlg.cpp

@@ -534 +534 @@
   SearchItem* current = static_cast<SearchItem*>(foundView->firstChild());
 
-  while(current) {
-    if(current->isSelected()) {
-      ICQUser* user = gUserManager.FetchUser(current->uin(), LOCK_N);
-
-      if(user)
+  while (current)
+  {
+    if (current->isSelected())
+    {
+      ICQUser* user = gUserManager.FetchUser(current->uin(), LOCK_R);
+
+      if (user)
+      {
+        bool tempUser = user->NotInList();
         gUserManager.DropUser(user);
-      else {
-        server->AddUserToList(current->uin());
-        if (qcbAlertUser->isChecked()) // alert the user they were added
-            server->icqAlertUser(current->uin());
+        if (tempUser)
+          gUserManager.RemoveUser(current->uin());
       }
-//      current->setSelected(false);
+
+      if (server->AddUserToList(current->uin()) &&
+          qcbAlertUser->isChecked()) // alert the user they were added
+        server->icqAlertUser(current->uin());
     }
     current = static_cast<SearchItem*>(current->nextSibling());
   }
+
   foundView->triggerUpdate();
   selectionChanged();