Changeset 6378 for trunk/osd

Timestamp:

07/01/08 06:43:26 (5 months ago)

Author:

flynd

Message:

Use the new DropOwner? function to properly specify which owner to unlock.

Files:

• trunk/osd/src/licq-osd.cpp (modified) (3 diffs)

trunk/osd/src/licq-osd.cpp

@@ -452 +452 @@
             if (want_osd)
         {
-        o=gUserManager.FetchOwner(LOCK_R);
-        if (o)
-        {
+        o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+        if (o != NULL)
+        {
             status=o->Status();
             //want_osd=true;
@@ -494 +494 @@
             }
 
-            gUserManager.DropOwner();
-        }
+          gUserManager.DropOwner(o);
+        }
         }
 
@@ -553 +553 @@
         if (ignore)
         want_osd=false;
-        if (s->Uin() == gUserManager.OwnerUin()) // no messages for our own actions
+        if (gUserManager.FindOwner(s->Id(), s->PPID()) != NULL) // no messages for our own actions
                 want_osd=false;