History

Fix recording deadlocks

Karol Suprynowicz committed 2 years ago

Commit 5ba1fce1 parent 444d5202 files · +6 −5Browse files

Showing the changes to libraries/script-engine/src/AssetScriptingInterface.cpp (1 of 2 files). Show all

Unified · Split

libraries/script-engine/src/AssetScriptingInterface.cpp+0−1
@@ -244,7 +244,6 @@ Promise AssetScriptingInterface::jsPromiseReady(Promise promise, const ScriptVal · 243 unmodified lines
244void AssetScriptingInterface::jsCallback(const ScriptValue& handler,244void AssetScriptingInterface::jsCallback(const ScriptValue& handler,
245 const ScriptValue& error, const ScriptValue& result) {245 const ScriptValue& error, const ScriptValue& result) {
246 Q_ASSERT(thread() == QThread::currentThread());246 Q_ASSERT(thread() == QThread::currentThread());
247 Q_ASSERT(engine());
248 //V8TODO: which kind of script context guard needs to be used here?247 //V8TODO: which kind of script context guard needs to be used here?
249 ScriptContextGuard scriptContextGuard(_scriptManager->engine()->currentContext());248 ScriptContextGuard scriptContextGuard(_scriptManager->engine()->currentContext());
250 auto errorValue = !error.toBool() ? engine()->nullValue() : error;249 auto errorValue = !error.toBool() ? engine()->nullValue() : error;