Functions connected to signals now use context that was active during connecting

ksuprynowicz committed 3 years ago

Commit 3a5b9271 parent 044cd505 files · +18 −7Browse files

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

Unified · Split

libraries/script-engine/src/ScriptManager.cpp+2−1

@@ -1122,6 +1122,7 @@ void ScriptManager::stopTimer(QTimer *timer) { · 1121 unmodified lines
1122	1122	}
1123	1123
1124	1124	QUrl ScriptManager::resolvePath(const QString& include) const {
	1125	+ //qDebug(scriptengine) << "ScriptManager::resolvePath: getCurrentScriptURLs: " << _engine->getCurrentScriptURLs();
1125	1126	QUrl url(include);
1126	1127	// first lets check to see if it's already a full URL -- or a Windows path like "c:/"
1127	1128	if (include.startsWith("/") \|\| url.scheme().length() == 1) {
@@ -1139,7 +1140,7 @@ QUrl ScriptManager::resolvePath(const QString& include) const { · 11 unmodified lines
1139	1140	do {
1140	1141	auto contextInfo = context->functionContext();
1141	1142	parentURL = QUrl(contextInfo->fileName());
1142		− qDebug(scriptengine) << "ScriptManager::resolvePath: URL get: " << parentURL << " backtrace: " << context->backtrace() << " " << _engine->getCurrentScriptURLs();
	1143	+ //qDebug(scriptengine) << "ScriptManager::resolvePath: URL get: " << parentURL << " backtrace: " << context->backtrace() << " " << _engine->getCurrentScriptURLs();
1143	1144	parentContext = context->parentContext();
1144	1145	context = parentContext.get();
1145	1146	} while (parentURL.isRelative() && context);