Merge pull request #500 from virtual-world-framework/branch/fix-toolb…

…ox-update Fix For Toolbox Setting When Switching Missions
virtual-world-framework · May 21, 2015 · 6d61407 · 6d61407
2 parents 1aea167 + fbb1922
commit 6d61407
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/support/client/lib/vwf/view/blockly.js b/support/client/lib/vwf/view/blockly.js
@@ -232,7 +232,7 @@ define( [ "module", "vwf/view", "jquery", "vwf/model/blockly/JS-Interpreter/acor
                         // If the new node is the same as the old - exit early to prevent 
                         // breaking synchronization.
 
-                        if ( previousActiveNode === blocklyNode ) {
+                        if ( previousActiveNode && blocklyNode && previousActiveNode === blocklyNode ) {
                             setBlockXML( blocklyNode );
                             break;
                         }