From 8e2436d5de9e8dbcba9425de4f57ca3050f810f5 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Tue, 30 Apr 2019 15:21:51 +0200
Subject: [PATCH] REmoving Controls

---
 Spaces/BottomSpace.js | 23 ++++++++++++++++++-----
 Spaces/PanelsSpace.js |  4 ++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Spaces/BottomSpace.js b/Spaces/BottomSpace.js
index 25938b9e2..eccf98ad2 100644
--- a/Spaces/BottomSpace.js
+++ b/Spaces/BottomSpace.js
@@ -54,12 +54,25 @@ function newBottomSpace () {
   }
 
   function destroyControl (pControlHandle) {
-    for (let i = 0; i < thisObject.controls.length; i++) {
-      let control = thisObject.controls[i]
+    thisObject.controls = controlsMap.get('Global')
+    if (thisObject.controls !== undefined) {
+      for (let i = 0; i < thisObject.controls.length; i++) {
+        let control = thisObject.controls[i]
+        if (control.handle === pControlHandle) {
+          thisObject.controls.splice(i, 1)  // Delete item from array.
+          return
+        }
+      }
+    }
 
-      if (control.handle === pControlHandle) {
-        thisObject.controls.splice(i, 1)  // Delete item from array.
-        return
+    thisObject.controls = controlsMap.get(window.CHART_ON_FOCUS)
+    if (thisObject.controls !== undefined) {
+      for (let i = 0; i < thisObject.controls.length; i++) {
+        let control = thisObject.controls[i]
+        if (control.handle === pControlHandle) {
+          thisObject.controls.splice(i, 1)  // Delete item from array.
+          return
+        }
       }
     }
   }
diff --git a/Spaces/PanelsSpace.js b/Spaces/PanelsSpace.js
index 89f7420b2..151d5af65 100644
--- a/Spaces/PanelsSpace.js
+++ b/Spaces/PanelsSpace.js
@@ -76,6 +76,10 @@ function newPanelsSpace () {
       let panel = thisObject.panels[i]
 
       if (panel.handle === pPanelHandle) {
+        if (panel.finalize !== undefined) {
+          panel.finalize()
+        }
+
         thisObject.panels.splice(i, 1)  // Delete item from array.
         return
       }