Commit 29185f6b authored by Jan Möbius's avatar Jan Möbius

- Updated OpenMesh

- Fixed RPC call from another thread (Thanks to Matthias Möller for the patch)
parent 081def21
......@@ -64,10 +64,10 @@ QScriptValue callFunction( QString _plugin, QString _functionName , std::vector<
RPCHelper h;
Qt::ConnectionType connection = Qt::DirectConnection;
if (h.thread() != QThread::currentThread())
if (h.thread() != QApplication::instance()->thread())
{
h.moveToThread(QApplication::instance()->thread());
connection = Qt::QueuedConnection;
connection = Qt::BlockingQueuedConnection;
}
QScriptValue retVal;
......@@ -90,10 +90,10 @@ QScriptValue callFunction( QString _plugin, QString _functionName ) {
RPCHelper h;
Qt::ConnectionType connection = Qt::DirectConnection;
if (h.thread() != QThread::currentThread())
if (h.thread() != QApplication::instance()->thread())
{
h.moveToThread(QApplication::instance()->thread());
connection = Qt::QueuedConnection;
connection = Qt::BlockingQueuedConnection;
}
QScriptValue retVal;
......
Subproject commit 4c23effb91e6529502812240ce3b6683bfcc3939
Subproject commit bd3ec6a988d0d1349510bae112bb1bedb1fcecf0
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment