scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 06:52:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #2099 from knandersen/bugfix/2085

Browse source 
Fix #2085 by handling discarded hub commands
This commit is contained in:
Kevin Nørby Andersen 2019-04-08 19:27:32 -04:00 committed by GitHub
commit 03b4d0e582
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/extensions/scratch3_boost/index.js
View file

@ -943,8 +943,9 @@ class Boost {
const motor = this.motor(portID);
if (motor) {
motor._status = feedback;
if (feedback === (BoostPortFeedback.COMPLETED ^ BoostPortFeedback.IDLE) &&
motor.pendingPromiseFunction) {
// Makes sure that commands resolve both when they actually complete and when they fail
const commandCompleted = feedback & (BoostPortFeedback.COMPLETED ^ BoostPortFeedback.DISCARDED);
if (commandCompleted && motor.pendingPromiseFunction) {
motor.pendingPromiseFunction();
}
}