suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #25 from vishesh/master

Browse Source 
FIX: fix stop-when without last-picture crash in world #23
This commit is contained in:
Jens Axel Søgaard 2015-06-05 00:07:40 +02:00
commit 96b39e3fef
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
whalesong/world/kernel.js
View File

@ -377,7 +377,7 @@ DefaultDrawingOutput.prototype.toRawHandler = function(MACHINE, toplevelNode) {
var StopWhen = function(handler, last_picture) {
WorldConfigOption.call(this, 'stop-when');
this.handler = handler;
this.last_picture = new ToDraw(last_picture);
this.last_picture = last_picture && new ToDraw(last_picture);
};
StopWhen.prototype = plt.baselib.heir(WorldConfigOption.prototype);
@ -385,6 +385,6 @@ StopWhen.prototype = plt.baselib.heir(WorldConfigOption.prototype);
StopWhen.prototype.toRawHandler = function(MACHINE, toplevelNode) {
var that = this;
var worldFunction = adaptWorldFunction(that.handler);
var lastPictureHandler = that.last_picture.toRawHandler(MACHINE, toplevelNode);
var lastPictureHandler = that.last_picture && that.last_picture.toRawHandler(MACHINE, toplevelNode);
return rawJsworld.stop_when(worldFunction, undefined, lastPictureHandler);
};

14
whalesong/world/raw-jsworld.js
View File

@ -663,12 +663,16 @@ var rawJsworld = {};
stopWhen.test(w,
function(stop) {
if (stop) {
var handler = stopWhen.last_picture_handler();
handler.onRegister(top);
handler._listener(w, oldW, function(v) {
if (stopWhen.last_picture_handler) {
var handler = stopWhen.last_picture_handler();
handler.onRegister(top);
handler._listener(w, oldW, function(v) {
Jsworld.shutdown({cleanShutdown: true});
k2();
})
} else {
Jsworld.shutdown({cleanShutdown: true});
k2();
})
}
} else { k2(); }
});
};