diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-04-14 08:43:05 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-04-14 08:43:05 (GMT) |
| commit | 01e7e16d34b23b1198455809860abe4e43d9606a (patch) | |
| tree | 8b184a60e812a2cd835d15cb304d6a46792ca9e3 /src/uscxml/interpreter | |
| parent | a22c9ab9c1a72bee6802dc8ada771930253f140b (diff) | |
| download | uscxml-01e7e16d34b23b1198455809860abe4e43d9606a.zip uscxml-01e7e16d34b23b1198455809860abe4e43d9606a.tar.gz uscxml-01e7e16d34b23b1198455809860abe4e43d9606a.tar.bz2 | |
Apps working again
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; } |