diff options
| author | Gubolin <gubolin@fantasymail.de> | 2014-12-07 11:53:57 +0100 |
|---|---|---|
| committer | Gubolin <gubolin@fantasymail.de> | 2014-12-07 11:53:57 +0100 |
| commit | 52f7082353f28395a0fd6952dc5a8765ace0fe9e (patch) | |
| tree | 01cdf30deaad9786c9faedb850195b0d7eab5397 /threads.js | |
| parent | 278c72442a914255602ef5beb9ebdb716e6fae4c (diff) | |
| parent | 83e9ec28d5106ecd347453cf1020d3ca2be1b063 (diff) | |
| download | snap-52f7082353f28395a0fd6952dc5a8765ace0fe9e.tar.gz snap-52f7082353f28395a0fd6952dc5a8765ace0fe9e.zip | |
Merge remote-tracking branch 'origin/issue_461' into development
Diffstat (limited to 'threads.js')
| -rw-r--r-- | threads.js | 19 |
1 files changed, 11 insertions, 8 deletions
@@ -1810,15 +1810,18 @@ Process.prototype.blockReceiver = function () { Process.prototype.doPlaySoundUntilDone = function (name) { var sprite = this.homeContext.receiver; - if (this.context.activeAudio === null) { - this.context.activeAudio = sprite.playSound(name); - } - if (this.context.activeAudio.ended - || this.context.activeAudio.terminated) { - return null; + + if (name !== '') { + if (this.context.activeAudio === null) { + this.context.activeAudio = sprite.playSound(name); + } + if (this.context.activeAudio.ended + || this.context.activeAudio.terminated) { + return null; + } + this.pushContext('doYield'); + this.pushContext(); } - this.pushContext('doYield'); - this.pushContext(); }; Process.prototype.doStopAllSounds = function () { |
