diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-01-14 16:15:09 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-01-14 16:15:09 (GMT) |
| commit | 836927aa902696297febc95132e2c82147c08c03 (patch) | |
| tree | 64bcbaa67c6f70acdb5f4cc9184f600fad46b826 /src/uscxml/plugins/invoker/im | |
| parent | f7ca1ebaa5a527f817892bc3794452df1a6c20c6 (diff) | |
| download | uscxml-836927aa902696297febc95132e2c82147c08c03.zip uscxml-836927aa902696297febc95132e2c82147c08c03.tar.gz uscxml-836927aa902696297febc95132e2c82147c08c03.tar.bz2 | |
Expect Invoker and Fedora build fixes
Diffstat (limited to 'src/uscxml/plugins/invoker/im')
| -rw-r--r-- | src/uscxml/plugins/invoker/im/IMInvoker.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/uscxml/plugins/invoker/im/IMInvoker.cpp b/src/uscxml/plugins/invoker/im/IMInvoker.cpp index 981f2fe..23594f3 100644 --- a/src/uscxml/plugins/invoker/im/IMInvoker.cpp +++ b/src/uscxml/plugins/invoker/im/IMInvoker.cpp @@ -572,14 +572,6 @@ Data IMInvoker::purpleValueToData(GValue* value) { IMInvoker::IMInvoker() { _account = NULL; - if (!_eventQueue) { - tthread::lock_guard<tthread::mutex> lock(_initMutex); - _eventQueue = new DelayedEventQueue(); - _eventQueue->addEvent("initLibPurple", IMInvoker::initLibPurple, 0, NULL); - _eventQueue->start(); - // make sure to have the shebang initialized when we leave - _initCond.wait(_initMutex); - } } IMInvoker::~IMInvoker() { @@ -593,6 +585,16 @@ IMInvoker::~IMInvoker() { boost::shared_ptr<InvokerImpl> IMInvoker::create(InterpreterImpl* interpreter) { boost::shared_ptr<IMInvoker> invoker = boost::shared_ptr<IMInvoker>(new IMInvoker()); + + if (!_eventQueue) { + tthread::lock_guard<tthread::mutex> lock(_initMutex); + _eventQueue = new DelayedEventQueue(); + _eventQueue->addEvent("initLibPurple", IMInvoker::initLibPurple, 0, NULL); + _eventQueue->start(); + // make sure to have the shebang initialized when we leave + _initCond.wait(_initMutex); + } + invoker->_dataModelVars.compound["plugins"] = _pluginData; return invoker; } |