Only log completely absent script functions as an error

darktyranitar · Dec 31, 2021 · 98f4bae · 98f4bae
1 parent 3bc9497
commit 98f4bae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ The **"Breaking Changes"** listed below are changes that have been made in the d
 ## [Unreleased]
 ### Changed
 - If an object event is inanimate, it will always render using its first frame.
+- Only log "Unknown custom script function" when a registered script function is not present in any script.
 
 ## [4.5.0] - 2021-12-26
 ### Added

diff --git a/src/scripting.cpp b/src/scripting.cpp
@@ -94,18 +94,20 @@ void Scripting::invokeAction(QString actionName) {
  if (!instance) return;
  if (!instance->registeredActions.contains(actionName)) return;
 
+ bool foundFunction = false;
  QString functionName = instance->registeredActions.value(actionName);
  for (QJSValue module : instance->modules) {
  QJSValue callbackFunction = module.property(functionName);
- if (callbackFunction.isUndefined() || !callbackFunction.isCallable()) {
- logError(QString("Unknown custom script function '%1'").arg(functionName));
+ if (callbackFunction.isUndefined() || !callbackFunction.isCallable())
  continue;
- }
+ foundFunction = true;
  if (tryErrorJS(callbackFunction)) continue;
 
  QJSValue result = callbackFunction.call(QJSValueList());
  if (tryErrorJS(result)) continue;
  }
+ if (!foundFunction)
+ logError(QString("Unknown custom script function '%1'").arg(functionName));
 }
 
 void Scripting::cb_ProjectOpened(QString projectPath) {