From c6815c11d414fbdaf3f3f4555ea542378378f337 Mon Sep 17 00:00:00 2001
From: jmoenig <jens@moenig.org>
Date: Wed, 1 Oct 2014 09:50:56 +0200
Subject: [PATCH] workaround for some REPORT / STOP BLOCK issues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

enables reporting and stopping a bock from within a C-shaped slot in a
custom block, but not (yet) out of nested C-shaped custom blocks (but
that’s coming up, too)
---
 history.txt | 3 +++
 threads.js  | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/history.txt b/history.txt
index a4ba13cc..fb2c065f 100755
--- a/history.txt
+++ b/history.txt
@@ -2291,3 +2291,6 @@ ______
 * Objects: fixed #378 (disable context menus for boolean representations)
 * Blocks: fixed #584
 
+140930
+------
+* Threads: workaround for some REPORT issues
diff --git a/threads.js b/threads.js
index 2b2c1f6d..6a59f3c6 100644
--- a/threads.js
+++ b/threads.js
@@ -83,7 +83,7 @@ ArgLabelMorph, localize, XML_Element, hex_sha512*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.threads = '2014-September-29';
+modules.threads = '2014-October-01';
 
 var ThreadManager;
 var Process;
@@ -955,7 +955,9 @@ Process.prototype.doReport = function (value, isCSlot) {
         this.context.pc = this.context.expression.length - 1;
     }
     if (isCSlot) {
-        if (this.context.parentContext.expression instanceof Array) {
+        if (this.context &&
+                this.context.parentContext &&
+                this.context.parentContext.expression instanceof Array) {
             this.popContext();
         }
     }