diff options
Diffstat (limited to 'src/uscxml/interpreter')
| -rw-r--r-- | src/uscxml/interpreter/InterpreterDraft6.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/uscxml/interpreter/InterpreterDraft6.cpp b/src/uscxml/interpreter/InterpreterDraft6.cpp index d3019d9..ef40362 100644 --- a/src/uscxml/interpreter/InterpreterDraft6.cpp +++ b/src/uscxml/interpreter/InterpreterDraft6.cpp @@ -379,14 +379,12 @@ bool InterpreterDraft6::isEnabledTransition(const Node<std::string>& transition, std::vector<std::string> eventNames = tokenizeIdRefs(eventName); - if (eventNames.size() > 0 && hasConditionMatch(transition)) { - std::vector<std::string>::iterator eventIter = eventNames.begin(); - while(eventIter != eventNames.end()) { - if(nameMatch(*eventIter, event)) { - return true; - } - eventIter++; + std::vector<std::string>::iterator eventIter = eventNames.begin(); + while(eventIter != eventNames.end()) { + if(nameMatch(*eventIter, event) && hasConditionMatch(transition)) { + return true; } + eventIter++; } return false; } |