Changeset 6805 for code/trunk/src/modules/objects

Timestamp:

Apr 29, 2010, 3:26:43 PM (15 years ago)

Author:

dafrick

Message:

Possible bug fix.

File:

• code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) (1 diff)

code/trunk/src/modules/objects/triggers/MultiTrigger.cc

@@ -115 +115 @@
         if(queue != NULL)
             COUT(4) << "MultiTrigger &" << this << ": " << queue->size() << " new states to state queue." << std::endl;
-        while(queue != NULL && queue->size() > 0)
-        {
-            //TODO: Be more efficient, Don't delete a state and create a new one immediately after that. Reuse!
-            MultiTriggerState* state = queue->front();
-            this->addState(state->bTriggered & this->isModeTriggered(state->originator), state->originator);
-            queue->pop();
-            delete state;
-        }
-        delete queue;
+        
+        if(queue != NULL)
+        {
+            while(queue->size() > 0)
+            {
+                //TODO: Be more efficient, Don't delete a state and create a new one immediately after that. Reuse!
+                MultiTriggerState* state = queue->front();
+                if(state == NULL)
+                    break;
+                    
+                this->addState(state->bTriggered & this->isModeTriggered(state->originator), state->originator);
+                queue->pop();
+                delete state;
+            }
+            delete queue;
+        }
 
         if (this->stateQueue_.size() > 0)