summaryrefslogtreecommitdiffstats
path: root/src/uscxml/concurrency
diff options
context:
space:
mode:
authorStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2012-09-16 00:12:32 (GMT)
committerStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2012-09-16 00:12:32 (GMT)
commitd7211d570f8b78442f35bd9c55808053eb18ecc2 (patch)
tree5f670609b6486e8bf4cad19ca0967d51cb0becb4 /src/uscxml/concurrency
parentaa6c3a1257a29cc5bcf8b94893732ee553f27582 (diff)
downloaduscxml-d7211d570f8b78442f35bd9c55808053eb18ecc2.zip
uscxml-d7211d570f8b78442f35bd9c55808053eb18ecc2.tar.gz
uscxml-d7211d570f8b78442f35bd9c55808053eb18ecc2.tar.bz2
Implemented invoke for nested SCXML instances
Diffstat (limited to 'src/uscxml/concurrency')
-rw-r--r--src/uscxml/concurrency/eventqueue/libevent/DelayedEventQueue.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/uscxml/concurrency/eventqueue/libevent/DelayedEventQueue.cpp b/src/uscxml/concurrency/eventqueue/libevent/DelayedEventQueue.cpp
index ce42af7..647380e 100644
--- a/src/uscxml/concurrency/eventqueue/libevent/DelayedEventQueue.cpp
+++ b/src/uscxml/concurrency/eventqueue/libevent/DelayedEventQueue.cpp
@@ -12,8 +12,7 @@ namespace uscxml {
DelayedEventQueue::~DelayedEventQueue() {
std::cout << "Deleting DelayedEventQueue" << std::endl;
- if(_eventLoop)
- event_base_loopbreak(_eventLoop);
+ stop();
if (_thread)
_thread->join();
if(_eventLoop)
@@ -66,6 +65,7 @@ namespace uscxml {
void DelayedEventQueue::stop() {
if (_isStarted) {
_isStarted = false;
+ event_base_loopbreak(_eventLoop);
_thread->join();
delete _thread;
}