From af9b3dec293c45ac4b109f4ef3c21ba2f5bc55c3 Mon Sep 17 00:00:00 2001
From: Jens Mönig <jens@moenig.org>
Date: Mon, 23 Mar 2015 12:44:46 +0100
Subject: OOP: Tweaks for scope conflicts when adding / removing vars

---
 threads.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'threads.js')

diff --git a/threads.js b/threads.js
index d3dcfc9..82f7ab0 100644
--- a/threads.js
+++ b/threads.js
@@ -83,7 +83,7 @@ ArgLabelMorph, localize, XML_Element, hex_sha512*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.threads = '2015-March-21';
+modules.threads = '2015-March-23';
 
 var ThreadManager;
 var Process;
@@ -1299,14 +1299,17 @@ Process.prototype.doRemoveTemporaries = function () {
 
 Process.prototype.doDeleteAttr = function (attrName) {
     // currently only variables are deletable
-    var name = attrName;
+    var name = attrName,
+        rcvr = this.blockReceiver();
 
     if (name instanceof Context) {
         if (name.expression.selector === 'reportGetVar') {
             name = name.expression.blockSpec;
         }
     }
-    this.blockReceiver().deleteVariable(name);
+    if (contains(rcvr.inheritedVariableNames(true), name)) {
+        rcvr.deleteVariable(name);
+    }
 };
 
 // Process lists primitives
-- 
cgit v1.3.1