From f6d096394a23726605dc6baf5c0ae37cab0036fe Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sun, 25 Oct 2020 11:38:15 +0100
Subject: [PATCH] fixes

---
 Canvas.js             | 9 ++++++++-
 EventsServerClient.js | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Canvas.js b/Canvas.js
index 131bf5195..6e69c14ab 100644
--- a/Canvas.js
+++ b/Canvas.js
@@ -158,7 +158,7 @@ function newCanvas() {
                     }
                 }
 
-                /* Space Animation */
+                /* Space Animation Physics */
                 for (let j = 0; j < projectDefinition.spaces.length; j++) {
                     let spaceInstance = spaceAnimationMap.get(j)
                     let spaceDefinition = spaceDefinitionMap.get(j)
@@ -166,6 +166,13 @@ function newCanvas() {
                     if (spaceInstance.physics !== undefined) {
                         thisObject.animation.addCallBackFunction(spaceDefinition.name + ' ' + 'Physics', spaceInstance.physics)
                     }
+                }
+
+                /* Space Animation Drawing*/
+                for (let j = 0; j < projectDefinition.spaces.length; j++) {
+                    let spaceInstance = spaceAnimationMap.get(j)
+                    let spaceDefinition = spaceDefinitionMap.get(j)
+                    if (spaceInstance === undefined || spaceDefinition === undefined) { continue }
                     if (spaceInstance.draw !== undefined) {
                         thisObject.animation.addCallBackFunction(spaceDefinition.name + ' ' + 'Draw', spaceInstance.draw)
                     }
diff --git a/EventsServerClient.js b/EventsServerClient.js
index 520d095a7..71002ce23 100644
--- a/EventsServerClient.js
+++ b/EventsServerClient.js
@@ -76,6 +76,8 @@ function newEventsServerClient(networkNode) {
     }
 
     function sendToWebSocketServer(command) {
+        if (commandsWaitingConfirmation === undefined) {return} // object already finalized
+
         nonce++
         let stringNonce = nonce.toString()
         let timestamp = (new Date()).valueOf()