Changeset 6108 for code/branches/presentation2/src/libraries

Timestamp:

Nov 20, 2009, 8:15:25 PM (15 years ago)

Author:

scheusso

Message:

merged steering branch to presentation2 branch

Location:

code/branches/presentation2

Files:

• . (modified) (1 prop)
• src/libraries/core/input/InputManager.cc (modified) (2 diffs)

code/branches/presentation2/src/libraries/core/input/InputManager.cc

@@ -631 +631 @@
                 {
                     // not scheduled for destruction
-                    // prevents a state being added multiple times
+                    // prevents a state from being added multiple times
                     stateEnterRequests_.insert(it->second);
                     return true;
                 }
             }
+            else if (this->stateLeaveRequests_.find(it->second) != this->stateLeaveRequests_.end())
+            {
+                // State already scheduled for leaving --> cancel
+                this->stateLeaveRequests_.erase(this->stateLeaveRequests_.find(it->second));
+            }
         }
         return false;
@@ -658 +663 @@
                 return true;
             }
+            else if (this->stateEnterRequests_.find(it->second) != this->stateEnterRequests_.end())
+            {
+                // State already scheduled for entering --> cancel
+                this->stateEnterRequests_.erase(this->stateEnterRequests_.find(it->second));
+            }
         }
         return false;