From 0718641bc7aadfe50aae113a5bf2947a98d04e85 Mon Sep 17 00:00:00 2001
From: tamat <contact@tamats.com>
Date: Sun, 24 May 2020 00:02:32 +0200
Subject: [PATCH] merge

---
 build/litegraph.js     | 4 ++--
 build/litegraph.min.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/litegraph.js b/build/litegraph.js
index 9bd16aab1..25f32a859 100644
--- a/build/litegraph.js
+++ b/build/litegraph.js
@@ -786,7 +786,7 @@
                 window.requestAnimationFrame(on_frame);
 				if(that.onBeforeStep)
 					that.onBeforeStep();
-                that.runStep(1, !this.catch_errors);
+                that.runStep(1, !that.catch_errors);
 				if(that.onAfterStep)
 					that.onAfterStep();
             }
@@ -797,7 +797,7 @@
                 //execute
 				if(that.onBeforeStep)
 					that.onBeforeStep();
-                that.runStep(1, !this.catch_errors);
+                that.runStep(1, !that.catch_errors);
 				if(that.onAfterStep)
 					that.onAfterStep();
             }, interval);
diff --git a/build/litegraph.min.js b/build/litegraph.min.js
index 9ea2d0110..70f79282a 100755
--- a/build/litegraph.min.js
+++ b/build/litegraph.min.js
@@ -24,8 +24,8 @@ e.EVENT&&b==e.ACTION)return!0;a=String(a);b=String(b);a=a.toLowerCase();b=b.toLo
 if("text"==b||"json"==b)return f.readAsText(a);if("blob"==b)return f.readAsBinaryString(a)}return null}};e.getTime="undefined"!=typeof performance?performance.now.bind(performance):"undefined"!=typeof Date&&Date.now?Date.now.bind(Date):"undefined"!=typeof process?function(){var a=process.hrtime();return 0.001*a[0]+1E-6*a[1]}:function(){return(new Date).getTime()};z.LGraph=e.LGraph=c;c.supported_types=["number","string","boolean"];c.prototype.getSupportedTypes=function(){return this.supported_types||
 c.supported_types};c.STATUS_STOPPED=1;c.STATUS_RUNNING=2;c.prototype.clear=function(){this.stop();this.status=c.STATUS_STOPPED;this.last_link_id=this.last_node_id=0;this._version=-1;if(this._nodes)for(var a=0;a<this._nodes.length;++a){var b=this._nodes[a];if(b.onRemoved)b.onRemoved()}this._nodes=[];this._nodes_by_id={};this._nodes_in_order=[];this._nodes_executable=null;this._groups=[];this.links={};this.iteration=0;this.config={};this.vars={};this.fixedtime=this.runningtime=this.globaltime=0;this.elapsed_time=
 this.fixedtime_lapse=0.01;this.starttime=this.last_update_time=0;this.catch_errors=!0;this.inputs={};this.outputs={};this.change();this.sendActionToCanvas("clear")};c.prototype.attachCanvas=function(a){if(a.constructor!=k)throw"attachCanvas expects a LGraphCanvas instance";a.graph&&a.graph!=this&&a.graph.detachCanvas(a);a.graph=this;this.list_of_graphcanvas||(this.list_of_graphcanvas=[]);this.list_of_graphcanvas.push(a)};c.prototype.detachCanvas=function(a){if(this.list_of_graphcanvas){var b=this.list_of_graphcanvas.indexOf(a);
--1!=b&&(a.graph=null,this.list_of_graphcanvas.splice(b,1))}};c.prototype.start=function(a){if(this.status!=c.STATUS_RUNNING){this.status=c.STATUS_RUNNING;if(this.onPlayEvent)this.onPlayEvent();this.sendEventToAllNodes("onStart");this.last_update_time=this.starttime=e.getTime();a=a||0;var b=this;if(0==a&&"undefined"!=typeof window&&window.requestAnimationFrame){var d=function(){if(-1==b.execution_timer_id){window.requestAnimationFrame(d);if(b.onBeforeStep)b.onBeforeStep();b.runStep(1,!this.catch_errors);
-if(b.onAfterStep)b.onAfterStep()}};this.execution_timer_id=-1;d()}else this.execution_timer_id=setInterval(function(){if(b.onBeforeStep)b.onBeforeStep();b.runStep(1,!this.catch_errors);if(b.onAfterStep)b.onAfterStep()},a)}};c.prototype.stop=function(){if(this.status!=c.STATUS_STOPPED){this.status=c.STATUS_STOPPED;if(this.onStopEvent)this.onStopEvent();null!=this.execution_timer_id&&(-1!=this.execution_timer_id&&clearInterval(this.execution_timer_id),this.execution_timer_id=null);this.sendEventToAllNodes("onStop")}};
+-1!=b&&(a.graph=null,this.list_of_graphcanvas.splice(b,1))}};c.prototype.start=function(a){if(this.status!=c.STATUS_RUNNING){this.status=c.STATUS_RUNNING;if(this.onPlayEvent)this.onPlayEvent();this.sendEventToAllNodes("onStart");this.last_update_time=this.starttime=e.getTime();a=a||0;var b=this;if(0==a&&"undefined"!=typeof window&&window.requestAnimationFrame){var d=function(){if(-1==b.execution_timer_id){window.requestAnimationFrame(d);if(b.onBeforeStep)b.onBeforeStep();b.runStep(1,!b.catch_errors);
+if(b.onAfterStep)b.onAfterStep()}};this.execution_timer_id=-1;d()}else this.execution_timer_id=setInterval(function(){if(b.onBeforeStep)b.onBeforeStep();b.runStep(1,!b.catch_errors);if(b.onAfterStep)b.onAfterStep()},a)}};c.prototype.stop=function(){if(this.status!=c.STATUS_STOPPED){this.status=c.STATUS_STOPPED;if(this.onStopEvent)this.onStopEvent();null!=this.execution_timer_id&&(-1!=this.execution_timer_id&&clearInterval(this.execution_timer_id),this.execution_timer_id=null);this.sendEventToAllNodes("onStop")}};
 c.prototype.runStep=function(a,b,d){a=a||1;var g=e.getTime();this.globaltime=0.001*(g-this.starttime);var f=this._nodes_executable?this._nodes_executable:this._nodes;if(f){d=d||f.length;if(b){for(var r=0;r<a;r++){for(var s=0;s<d;++s){var c=f[s];if(c.mode==e.ALWAYS&&c.onExecute)c.onExecute()}this.fixedtime+=this.fixedtime_lapse;if(this.onExecuteStep)this.onExecuteStep()}if(this.onAfterExecute)this.onAfterExecute()}else try{for(r=0;r<a;r++){for(s=0;s<d;++s)if(c=f[s],c.mode==e.ALWAYS&&c.onExecute)c.onExecute();
 this.fixedtime+=this.fixedtime_lapse;if(this.onExecuteStep)this.onExecuteStep()}if(this.onAfterExecute)this.onAfterExecute();this.errors_in_execution=!1}catch(l){this.errors_in_execution=!0;if(e.throw_errors)throw l;e.debug&&console.log("Error during execution: "+l);this.stop()}a=e.getTime();g=a-g;0==g&&(g=1);this.execution_time=0.001*g;this.globaltime+=0.001*g;this.iteration+=1;this.elapsed_time=0.001*(a-this.last_update_time);this.last_update_time=a}};c.prototype.updateExecutionOrder=function(){this._nodes_in_order=
 this.computeExecutionOrder(!1);this._nodes_executable=[];for(var a=0;a<this._nodes_in_order.length;++a)this._nodes_in_order[a].onExecute&&this._nodes_executable.push(this._nodes_in_order[a])};c.prototype.computeExecutionOrder=function(a,b){for(var d=[],g=[],f={},r={},s={},c=0,l=this._nodes.length;c<l;++c){var q=this._nodes[c];if(!a||q.onExecute){f[q.id]=q;var p=0;if(q.inputs)for(var v=0,k=q.inputs.length;v<k;v++)q.inputs[v]&&null!=q.inputs[v].link&&(p+=1);0==p?(g.push(q),b&&(q._level=1)):(b&&(q._level=