Changeset 6471

Timestamp:

07/27/08 18:50:04 (4 months ago)

Author:

flynd

Message:

If we get an owner event, don't lock the owner at the same time as the user, which in this case also is the owner. This fixes #1631.

Files:

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

trunk/qt-gui/src/mainwin.cpp

@@ -1398 +1398 @@
       if (m_bAutoPopup && sig->Argument() > 0)
       {
+        const ICQOwner* o = gUserManager.FetchOwner(nPPID, LOCK_R);
+        unsigned short s = ICQ_STATUS_OFFLINE; // if we have no owner we're very likely offline
+        if (o != NULL)
+        {
+          s = o->Status();
+          gUserManager.DropOwner(o);
+        }
+
         ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
         if (u != NULL && u->NewMessages() > 0)
         {
-          ICQOwner *o = gUserManager.FetchOwner(nPPID, LOCK_R);
-          unsigned short s;
-          if (o == 0)
-          {
-            s = ICQ_STATUS_OFFLINE; // if we have no owner we're very likely offline ;)
-          }
-          else
-          {
-            s = o->Status();
-            gUserManager.DropOwner(o);
-          }
           if (s == ICQ_STATUS_ONLINE || s == ICQ_STATUS_FREEFORCHAT)
           {