From 15396331986b30c9fdd9425fae0896cf1ac08d50 Mon Sep 17 00:00:00 2001
From: clwe <clemens@chair.audio>
Date: Wed, 1 Jul 2020 16:09:34 +0200
Subject: [PATCH] PD: reset global arrays on script reload to fix wrong lights
 display

---
 src/LibPDEngine.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/LibPDEngine.cpp b/src/LibPDEngine.cpp
index 7d15fc9..fe4199d 100644
--- a/src/LibPDEngine.cpp
+++ b/src/LibPDEngine.cpp
@@ -208,9 +208,8 @@ void LibPDEngine::receiveLights(const char *s) {
 
 		// parse switch lights list
 		bool utility_is_valid = true;
-		int utility_idx = -1;
 		try {
-				utility_idx = _utility_map.at(atoms[1]);      // map::at throws an out-of-range
+				_utility_map.at(atoms[1]);      // map::at throws an out-of-range
 			}
 		catch (const std::out_of_range& oor) {
 			utility_is_valid = false;
@@ -221,7 +220,7 @@ void LibPDEngine::receiveLights(const char *s) {
 		if(utility_is_valid && atoms.size()>=3){
 			g_utility[0] = atoms[1]; // display
 			g_utility[1] = {""}; 
-			for(int i=0; i<atoms.size()-2; i++){
+			for(unsigned i=0; i<atoms.size()-2; i++){
 				g_utility[1] += " " +atoms[i+2]; // concatenate message
 			}
 			g_display_is_valid = true;
@@ -301,5 +300,20 @@ void LibPDEngine::sendInitialStates(const ProcessBlock* block){
 		std::to_string(PD_MINOR_VERSION)+"."
 		+std::to_string(PD_BUGFIX_VERSION);
 
+
+	for(int i=0; i<NUM_ROWS; i++){
+		g_lights[i][0] = 0;
+		g_lights[i][1] = 0;
+		g_lights[i][2] = 0;
+		g_switchLights[i][0] = 0;
+		g_switchLights[i][1] = 0;
+		g_switchLights[i][2] = 0;
+	}
+
+	g_utility[0] = "";
+	g_utility[1] = "";
+
+	g_display_is_valid = false;
+
 	display(version);
 }
\ No newline at end of file