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

Merge pull request #2055 from evhan55/extensions/disconnect-fixes

Browse source 
Fix hardware extension disconnect behavior
This commit is contained in:
Evelyn Eastmond 2019-03-20 11:01:36 -04:00 committed by GitHub
commit 35d255319b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/io/ble.js
View file

@ -73,14 +73,19 @@ class BLE extends JSONRPCWebSocket {
* Close the websocket. * Close the websocket.
*/ */
disconnect () { disconnect () {
if (this._ws.readyState !== this._ws.OPEN) return; if (this._ws.readyState === this._ws.OPEN) {
this._ws.close();
}
if (this._connected) {
this._connected = false;
}
this._ws.close();
this._connected = false;
if (this._discoverTimeoutID) { if (this._discoverTimeoutID) {
window.clearTimeout(this._discoverTimeoutID); window.clearTimeout(this._discoverTimeoutID);
} }
// Sets connection status icon to orange
this._runtime.emit(this._runtime.constructor.PERIPHERAL_DISCONNECTED); this._runtime.emit(this._runtime.constructor.PERIPHERAL_DISCONNECTED);
} }

11
src/io/bt.js
View file

@ -75,14 +75,19 @@ class BT extends JSONRPCWebSocket {
* Close the websocket. * Close the websocket.
*/ */
disconnect () { disconnect () {
if (this._ws.readyState !== this._ws.OPEN) return; if (this._ws.readyState === this._ws.OPEN) {
this._ws.close();
}
if (this._connected) {
this._connected = false;
}
this._ws.close();
this._connected = false;
if (this._discoverTimeoutID) { if (this._discoverTimeoutID) {
window.clearTimeout(this._discoverTimeoutID); window.clearTimeout(this._discoverTimeoutID);
} }
// Sets connection status icon to orange
this._runtime.emit(this._runtime.constructor.PERIPHERAL_DISCONNECTED); this._runtime.emit(this._runtime.constructor.PERIPHERAL_DISCONNECTED);
} }