Fix crash in Assets.setBakingEnabled() when callback undefined

David Rowe committed 7 years ago

Commit fb818c01 parent 746f97a1 file · +3 −0Browse files

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

Unified · Split

libraries/script-engine/src/AssetScriptingInterface.cpp+3−0

@@ -127,6 +127,9 @@ void AssetScriptingInterface::setBakingEnabled(QString path, bool enabled, QScri · 126 unmodified lines
127	auto setBakingEnabledRequest = DependencyManager::get<AssetClient>()->createSetBakingEnabledRequest({ path }, enabled);	127	auto setBakingEnabledRequest = DependencyManager::get<AssetClient>()->createSetBakingEnabledRequest({ path }, enabled);
128		128
129	Promise deferred = jsPromiseReady(makePromise(__FUNCTION__), thisObject(), callback);	129	Promise deferred = jsPromiseReady(makePromise(__FUNCTION__), thisObject(), callback);
		130	if (!deferred) {
		131	return;
		132	}
130		133
131	connect(setBakingEnabledRequest, &SetBakingEnabledRequest::finished, setBakingEnabledRequest, [deferred](SetBakingEnabledRequest* request) {	134	connect(setBakingEnabledRequest, &SetBakingEnabledRequest::finished, setBakingEnabledRequest, [deferred](SetBakingEnabledRequest* request) {
132	Q_ASSERT(QThread::currentThread() == request->thread());	135	Q_ASSERT(QThread::currentThread() == request->thread());