summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gui.js4
-rwxr-xr-xhistory.txt1
2 files changed, 3 insertions, 2 deletions
diff --git a/gui.js b/gui.js
index 6af9137..7f4d7db 100644
--- a/gui.js
+++ b/gui.js
@@ -69,7 +69,7 @@ SpeechBubbleMorph*/
// Global stuff ////////////////////////////////////////////////////////
-modules.gui = '2014-July-30';
+modules.gui = '2014-September-22';
// Declarations
@@ -1859,7 +1859,7 @@ IDE_Morph.prototype.newSpriteName = function (name, ignoredSprite) {
stem = (ix < 0) ? name : name.substring(0, ix),
count = 1,
newName = stem,
- all = this.sprites.asArray().filter(
+ all = this.sprites.asArray().concat(this.stage).filter(
function (each) {return each !== ignoredSprite; }
).map(
function (each) {return each.name; }
diff --git a/history.txt b/history.txt
index 848e906..cf09d79 100755
--- a/history.txt
+++ b/history.txt
@@ -2274,3 +2274,4 @@ ______
140922
------
* Blocks: Make upvars mutable
+* GUI: fixed #585 (sprite name conflict with stage). Thanks, Michael, for the report!