In the clearDevice function, first determine whether there is a devic…

…e loaded and then perform the cleanup
openblockcc · Jul 1, 2024 · 0ea387e · 0ea387e
1 parent 5893039
commit 0ea387e
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/extension-support/extension-manager.js b/src/extension-support/extension-manager.js
@@ -378,19 +378,21 @@ class ExtensionManager {
      * Clear curent device
      */
     clearDevice () {
-        this.runtime.disconnectPeripheral(this.runtime.getDevice().deviceId);
+        if (this.runtime.getDevice().deviceId) {
+            this.runtime.disconnectPeripheral(this.runtime.getDevice().deviceId);
 
-        const deviceId = this.runtime.getDevice().deviceId;
+            const deviceId = this.runtime.getDevice().deviceId;
 
-        this.runtime.clearDevice();
-        this.runtime.clearMonitor();
-        this._loadedDevice.clear();
+            this.runtime.clearDevice();
+            this.runtime.clearMonitor();
+            this._loadedDevice.clear();
 
-        // Clear current extentions.
-        this.clearExtensions();
-        this.clearDeviceExtension();
+            // Clear current extentions.
+            this.clearExtensions();
+            this.clearDeviceExtension();
 
-        this.runtime.emit(this.runtime.constructor.SCRATCH_EXTENSION_REMOVED, {deviceId});
+            this.runtime.emit(this.runtime.constructor.SCRATCH_EXTENSION_REMOVED, {deviceId});
+        }
     }
 
     /**