scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-01-10 15:02:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #41 from tmickel/bugfix/39

Browse source 
Resolve existing motor timeout (instead of reject)
This commit is contained in:
Tim Mickel 2016-05-09 14:34:50 -04:00
commit b30ee492be
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/blocks/wedo2.js
View file

@ -61,7 +61,7 @@ WeDo2Blocks.prototype._clamp = function(val, min, max) {
WeDo2Blocks.prototype._motorOnFor = function(direction, durationSeconds, util) {
if (this._motorTimeout > 0) {
// @todo maybe this should go through util
YieldTimers.reject(this._motorTimeout);
YieldTimers.resolve(this._motorTimeout);
this._motorTimeout = null;
}
if (window.native) {

2
vm.js
View file

@ -2175,7 +2175,7 @@
WeDo2Blocks.prototype._motorOnFor = function(direction, durationSeconds, util) {
if (this._motorTimeout > 0) {
// @todo maybe this should go through util
YieldTimers.reject(this._motorTimeout);
YieldTimers.resolve(this._motorTimeout);
this._motorTimeout = null;
}
if (window.native) {

2
vm.min.js vendored
View file

File diff suppressed because one or more lines are too long