Fix: lost link when loading a Multiplex > Set list value command

member 'ghostData' from ParamLinkContainer was mistakenly used (and overwritten) in GenericControllableCommand.
benkuper · Apr 12, 2024 · 0ce6d5f · 0ce6d5f
1 parent 245babf
commit 0ce6d5f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/Source/Common/ParameterLink/ParameterLink.cpp b/Source/Common/ParameterLink/ParameterLink.cpp
@@ -426,7 +426,7 @@ ParamLinkContainer::ParamLinkContainer(const String& name, Multiplex* multiplex)
 	MultiplexTarget(multiplex),
 	paramsCanBeLinked(true),
 	canLinkToMapping(true),
-	ghostData(new DynamicObject())
+	linksGhostData(new DynamicObject())
 {
 	scriptObject.getDynamicObject()->setMethod("linkParamToMappingIndex", &ParamLinkContainer::linkParamToMappingIndexFromScript);
 }
@@ -452,9 +452,9 @@ void ParamLinkContainer::onControllableAdded(Controllable* c)
 		paramLinkMap.set(p, pLink);
 		linkParamMap.set(pLink, p);
 
-		if (ghostData.hasProperty(pLink->parameter->shortName))
+		if (linksGhostData.hasProperty(pLink->parameter->shortName))
 		{
-			pLink->loadJSONData(ghostData.getProperty(pLink->parameter->shortName, var()));
+			pLink->loadJSONData(linksGhostData.getProperty(pLink->parameter->shortName, var()));
 		}
 	}
 }
@@ -468,8 +468,8 @@ void ParamLinkContainer::onControllableRemoved(Controllable* c)
 		{
 			if (ParameterLink* pLink = paramLinkMap[p])
 			{
-				if (ghostData.isVoid()) ghostData = new DynamicObject();
-				ghostData.getDynamicObject()->setProperty(pLink->parameter->shortName, pLink->getJSONData());
+				if (linksGhostData.isVoid()) linksGhostData = new DynamicObject();
+				linksGhostData.getDynamicObject()->setProperty(pLink->parameter->shortName, pLink->getJSONData());
 
 				pLink->removeParameterLinkListener(this);
 
@@ -593,15 +593,15 @@ var ParamLinkContainer::getJSONData()
 
 void ParamLinkContainer::loadJSONDataInternal(var data)
 {
-	ghostData = data.getProperty("paramLinks", var()).clone();
+	linksGhostData = data.getProperty("paramLinks", var()).clone();
 	for (auto& pLink : paramLinks)
 	{
 		if (pLink->parameter == nullptr || pLink->parameter.wasObjectDeleted()) continue;
 
-		if (ghostData.isObject() && ghostData.hasProperty(pLink->parameter->shortName))
+		if (linksGhostData.isObject() && linksGhostData.hasProperty(pLink->parameter->shortName))
 		{
-			pLink->loadJSONData(ghostData.getProperty(pLink->parameter->shortName, var()));
-			ghostData.getDynamicObject()->removeProperty(pLink->parameter->shortName);
+			pLink->loadJSONData(linksGhostData.getProperty(pLink->parameter->shortName, var()));
+			linksGhostData.getDynamicObject()->removeProperty(pLink->parameter->shortName);
 		}
 		else
 		{
@@ -616,4 +616,4 @@ InspectableEditor* ParamLinkContainer::getEditorInternal(bool isRoot, Array<Insp
 	if (!paramsCanBeLinked) return new GenericControllableContainerEditor(this, isRoot);
 
 	return new ParamLinkContainerEditor(this, isRoot, true);
-}
+}
diff --git a/Source/Common/ParameterLink/ParameterLink.h b/Source/Common/ParameterLink/ParameterLink.h
@@ -109,7 +109,7 @@ class ParamLinkContainer :
     bool paramsCanBeLinked;
     bool canLinkToMapping;
 
-    var ghostData;
+    var linksGhostData;
 
     virtual void onControllableAdded(Controllable* c) override;
     virtual void onControllableRemoved(Controllable* c) override;
@@ -168,4 +168,4 @@ class ParamLinkContainer :
     virtual void loadJSONDataInternal(var data) override;
 
     virtual InspectableEditor* getEditorInternal(bool isRoot, Array<Inspectable*> inspectables = Array<Inspectable*>()) override;
-};
+};
diff --git a/Source/Module/modules/common/commands/generic/GenericControllableCommand.h b/Source/Module/modules/common/commands/generic/GenericControllableCommand.h
@@ -33,7 +33,8 @@ class GenericControllableCommand :
 
 	WeakReference<Parameter> value;
 	var dataToLoad;
-	var ghostValueData; // to keep when target is lost
+    var ghostData;
+    var ghostValueData; // to keep when target is lost
 	var ghostValueParamLinkData;
 	var ghostOperator;
 	var ghostComponent;