Merge pull request #6460 from EdgarPironti/asset_branch

Save clip to asset - removing last fix
This commit is contained in:
samcake 2015-11-20 18:52:18 -08:00
commit eecb5b91b2

View file

@ -185,13 +185,10 @@ bool RecordingScriptingInterface::saveRecordingToAsset(QScriptValue getClipAtpUr
return false; return false;
} }
if (QThread::currentThread() != thread()) { if (QThread::currentThread() != thread()) {
bool result{ false };
QMetaObject::invokeMethod(this, "saveRecordingToAsset", Qt::BlockingQueuedConnection, QMetaObject::invokeMethod(this, "saveRecordingToAsset", Qt::BlockingQueuedConnection,
Q_ARG(QScriptValue, getClipAtpUrl), Q_ARG(QScriptValue, getClipAtpUrl));
Q_RETURN_ARG(bool, result)); return false;
return result;
} }
if (!_lastClip) { if (!_lastClip) {