Changeset 6132 for trunk/qt4-gui/src/contactlist

Timestamp:

04/07/08 04:33:22 (8 months ago)

Author:

flynd

Message:

Fixed timer handling for contact animations so animations won't stop working after removing a contact.

Files:

• trunk/qt4-gui/src/contactlist/contactuserdata.cpp (modified) (6 diffs)

trunk/qt4-gui/src/contactlist/contactuserdata.cpp

@@ -99 +99 @@
 {
   // Free up animation timer resource if we were using it
-  myFlash = false;
-  myOnlCounter = 0;
-  myCarCounter = 0;
-  stopAnimation();
+  if (myFlash || myOnlCounter > 0 || myCarCounter > 0)
+    stopAnimation();
 
   // Remove this user from all groups
@@ -119 +117 @@
       if (sig->Argument() == 0)
       {
-        // User came online
+        // User fetched our auto respons message
         myCarCounter = ((5*1000/FLASH_TIME)+1)&(-2);
         startAnimation();
@@ -129 +127 @@
       if (sig->Argument() == 1)
       {
-        // User fetched our auto respons message
+        // User came online
         myOnlCounter = 5*1000/FLASH_TIME; // run about 5 seconds
         startAnimation();
@@ -495 +493 @@
 {
   // Start common timer if not already running
-  if (myAnimatorCount == 0)
+  if (!myAnimateTimer->isActive())
     myAnimateTimer->start();
 
@@ -509 +507 @@
 void ContactUserData::stopAnimation()
 {
-  myAnimating = myFlash || myOnlCounter || myCarCounter;
-
-  // If this was the only or last animation disconnect from timer
-  if (!myAnimating)
-  {
-    disconnect(myAnimateTimer, SIGNAL(timeout()), this, SLOT(animate()));
-    myAnimatorCount--;
-
-    // Stop animation timer if noone is using it anymore
-    if (myAnimatorCount == 0)
-      myAnimateTimer->stop();
-  }
+  // Disconnect from timer and keep track of usage
+  disconnect(myAnimateTimer, SIGNAL(timeout()), this, SLOT(animate()));
+  myAnimatorCount--;
+
+  // Stop animation timer if noone is using it anymore
+  if (myAnimatorCount == 0)
+    myAnimateTimer->stop();
+
+  myAnimating = false;
 }
 
@@ -538 +533 @@
 
   // Release timer if this was last animation
-  stopAnimation();
+  if (!myFlash && myOnlCounter == 0 && myCarCounter == 0)
+    stopAnimation();
 
   // data() will check the counter value to determine which icon to show so nothing to do here except triggering an update