better handle null senders, trim lines after 2000

Brad Hefta-Gaub committed 9 years ago

Commit 04480231 parent f8bae602 files · +17 −5Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+10−5

@@ -34,27 +34,32 @@ ScriptsModel& getScriptsModel() { · 33 unmodified lines
34	34
35	35	void ScriptEngines::onPrintedMessage(const QString& message) {
36	36	auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
37		− emit printedMessage(message, scriptEngine->getFilename());
	37	+ auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
	38	+ emit printedMessage(message, scriptName);
38	39	}
39	40
40	41	void ScriptEngines::onErrorMessage(const QString& message) {
41	42	auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
42		− emit errorMessage(message, scriptEngine->getFilename());
	43	+ auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
	44	+ emit errorMessage(message, scriptName);
43	45	}
44	46
45	47	void ScriptEngines::onWarningMessage(const QString& message) {
46	48	auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
47		− emit warningMessage(message, scriptEngine->getFilename());
	49	+ auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
	50	+ emit warningMessage(message, scriptName);
48	51	}
49	52
50	53	void ScriptEngines::onInfoMessage(const QString& message) {
51	54	auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
52		− emit infoMessage(message, scriptEngine->getFilename());
	55	+ auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
	56	+ emit infoMessage(message, scriptName);
53	57	}
54	58
55	59	void ScriptEngines::onErrorLoadingScript(const QString& url) {
56	60	auto scriptEngine = qobject_cast<ScriptEngine*>(sender());
57		− emit errorLoadingScript(url, scriptEngine->getFilename());
	61	+ auto scriptName = scriptEngine ? scriptEngine->getFilename() : "";
	62	+ emit errorLoadingScript(url, scriptName);
58	63	}
59	64
60	65	ScriptEngines::ScriptEngines()