summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmoenig <jens@moenig.org>2014-10-01 09:50:56 +0200
committerjmoenig <jens@moenig.org>2014-10-01 09:50:56 +0200
commitc6815c11d414fbdaf3f3f4555ea542378378f337 (patch)
tree806db9f03ca9bf3a5eef660d2f95bb089c058b1a
parentebbd0be87ac9d8b2ac80857089350cfdd11f27b4 (diff)
downloadsnap-byow-c6815c11d414fbdaf3f3f4555ea542378378f337.tar.gz
snap-byow-c6815c11d414fbdaf3f3f4555ea542378378f337.zip
workaround for some REPORT / STOP BLOCK issues
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)
-rwxr-xr-xhistory.txt3
-rw-r--r--threads.js6
2 files changed, 7 insertions, 2 deletions
diff --git a/history.txt b/history.txt
index a4ba13c..fb2c065 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 2b2c1f6..6a59f3c 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();
}
}