Merge pull request phaserjs#367 from georgiee/develop

photonstorm · photonstorm · commit 0b1862581176 · 2014-02-06T21:20:29.000Z
Phaser.Timer#stop
diff --git a/src/time/Timer.js b/src/time/Timer.js
@@ -327,7 +327,7 @@ Phaser.Timer.prototype = {
         {
             this._i = 0;
 
-            while (this._i < this._len)
+            while (this._i < this._len && this.running)
             {
                 if (this._now >= this.events[this._i].tick)
                 {

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ Phaser.Timer.prototype = {`
`327`	`327`	`{`
`328`	`328`	`this._i = 0;`
`329`	`329`
`330`		`- while (this._i < this._len)`
	`330`	`+ while (this._i < this._len && this.running)`
`331`	`331`	`{`
`332`	`332`	`if (this._now >= this.events[this._i].tick)`
`333`	`333`	`{`