Merge remote-tracking branch 'origin/master'

benkuper · Sep 9, 2024 · 94b2d60 · 94b2d60
2 parents 849846c + 9f88687
commit 94b2d60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Source/Common/ParameterLink/ParameterLink.cpp b/Source/Common/ParameterLink/ParameterLink.cpp
@@ -592,7 +592,7 @@ void ParamLinkContainer::linkParamToMappingIndex(Parameter* p, int mappingIndex)
 
 var ParamLinkContainer::linkParamToMappingIndexFromScript(const var::NativeFunctionArgs& a)
 {
-	if (!checkNumArgs("linkToMappingIndex", a, 2)) return false;
+	if (!checkNumArgs("linkParamToMappingIndex", a, 2)) return false;
 
 	if (ParameterLink* link = getLinkedParamFromScript(a))
 	{
@@ -609,7 +609,7 @@ var ParamLinkContainer::linkParamToMappingIndexFromScript(const var::NativeFunct
 
 var ParamLinkContainer::setParamLinkFromScript(const var::NativeFunctionArgs& a)
 {
-	if (!checkNumArgs("setLink", a, 2)) return false;
+	if (!checkNumArgs("setParamLink", a, 2)) return false;
 	if (ParameterLink* link = getLinkedParamFromScript(a))
 	{
 		link->setLinkFromScript(a.arguments[1]);
@@ -620,7 +620,7 @@ var ParamLinkContainer::setParamLinkFromScript(const var::NativeFunctionArgs& a)
 
 var ParamLinkContainer::unlinkParamFromScript(const var::NativeFunctionArgs& a)
 {
-	if (!checkNumArgs("setLink", a, 2)) return false;
+	if (!checkNumArgs("unlinkParam", a, 1)) return false;
 	if (ParameterLink* link = getLinkedParamFromScript(a))
 	{
 		link->setLinkType(ParameterLink::NONE);

diff --git a/Source/Common/Processor/Action/Condition/ui/ConditionEditor.cpp b/Source/Common/Processor/Action/Condition/ui/ConditionEditor.cpp
@@ -59,6 +59,6 @@ void ConditionEditor::newMessage(const Condition::ConditionEvent &e)
 
 void ConditionEditor::childBoundsChanged(Component * c)
 {
-	//resized();
+	resized();
 	repaint();
 }