From ce60d740afeadab201b60e70ae3280f34ac412a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20M=C3=B6nig?= <jens@moenig.org>
Date: Thu, 19 Jan 2017 15:03:13 +0100
Subject: [PATCH] fixed #1630

---
 blocks.js   |  7 +++++--
 gui.js      |  4 ++--
 history.txt | 10 +++++++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/blocks.js b/blocks.js
index 9b2a8281..5861350b 100644
--- a/blocks.js
+++ b/blocks.js
@@ -150,7 +150,7 @@ CustomCommandBlockMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.blocks = '2017-January-13';
+modules.blocks = '2017-January-19';
 
 var SyntaxElementMorph;
 var BlockMorph;
@@ -2824,7 +2824,10 @@ BlockMorph.prototype.restoreInputs = function (oldInputs) {
         if (old instanceof ReporterBlockMorph) {
             leftOver.push(old);
         } else if (old instanceof CommandSlotMorph) {
-            leftOver.push(old.nestedBlock());
+            nb = old.nestedBlock();
+            if (nb) {
+                leftOver.push(nb);
+            }
         }
     }
     this.cachedInputs = null;
diff --git a/gui.js b/gui.js
index f63a950f..c69d2453 100644
--- a/gui.js
+++ b/gui.js
@@ -74,7 +74,7 @@ isRetinaSupported, SliderMorph, Animation*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.gui = '2017-January-13';
+modules.gui = '2017-January-19';
 
 // Declarations
 
@@ -3187,7 +3187,7 @@ IDE_Morph.prototype.aboutSnap = function () {
         module, btn1, btn2, btn3, btn4, licenseBtn, translatorsBtn,
         world = this.world();
 
-    aboutTxt = 'Snap! 4.0.10\nBuild Your Own Blocks\n\n'
+    aboutTxt = 'Snap! 4.0.10.1 - dev -\nBuild Your Own Blocks\n\n'
         + 'Copyright \u24B8 2017 Jens M\u00F6nig and '
         + 'Brian Harvey\n'
         + 'jens@moenig.org, bh@cs.berkeley.edu\n\n'
diff --git a/history.txt b/history.txt
index 631bb1c4..0507040e 100755
--- a/history.txt
+++ b/history.txt
@@ -3277,7 +3277,7 @@ http://snap.berkeley.edu/run#cloud:Username=jens&ProjectName=rotation
 * GUI: added "savingPreferences" flag for bh's "Eisenbergification" library, sigh.
 
 
-== v4.10 ===
+== v4.0.10 ===
 
 Features:
 * auto-wrapping of C-slots
@@ -3302,3 +3302,11 @@ Fixes:
 * Evaluate the generic WHEN-hat block’s predicate and first step of the attached script in the same atom
 * “go back _ layers” to work with out-of bounds numbers, thanks, Brian Broll!
 * Translation updates (Russian, Polish, Danish, Portuguese, Catalan, German)
+
+
+== v4.0.10.1 - in development - ===
+
+170119
+------
+* GUI: began new development version
+* Blocks: fixed #1630