Merge pull request #54 from istnv/bug/missing-vars

Bugfix: prevent variable overwrite
bitfocus · Feb 3, 2023 · b683f63 · b683f63
2 parents 03421b2 + cf6b2f0
commit b683f63
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/index.js b/index.js
@@ -640,9 +640,10 @@ instance.prototype.init_solos = function () {
 	}
 	self.soloOffset = soloOffset;
 	Object.assign(self.xStat, stat);
-	Object.assign(self.variableDefs, soloVariables);
 	Object.assign(self.actionDefs, soloActions);
 	Object.assign(self.muteFeedbacks, soloFeedbacks);
+	self.variableDefs.push(...soloVariables);
+
 };
 
 instance.prototype.init_strips = function () {
@@ -1700,12 +1701,9 @@ instance.prototype.init_strips = function () {
 		}
 	}
 	self.xStat = stat;
-	self.variableDefs = defVariables;
 	self.actionDefs = fadeActions;
-	Object.assign(self.actionDefs, sendActions);
-	Object.assign(self.actionDefs, muteActions);
-	Object.assign(self.actionDefs, procActions);
-	Object.assign(self.actionDefs, storeActions);
+	Object.assign(self.actionDefs, sendActions, muteActions, procActions, storeActions);
+	self.variableDefs.push(...defVariables);
 	self.muteFeedbacks = muteFeedbacks;
 	self.colorFeedbacks = colorFeedbacks;
 };

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
 	"legacy": [
 		"xair"
 	],
-	"version": "1.6.11",
+	"version": "1.6.12",
 	"api_version": "1.0.0",
 	"keywords": [
 		"Audio",