From eb7867f68736abf067713ee62a3aeefb9abde36c Mon Sep 17 00:00:00 2001 From: Andrew Nagy Date: Wed, 30 Oct 2024 18:55:38 -0700 Subject: [PATCH] Fix bug in deleting devices --- .vscode/launch.json | 29 +++++++++++++++++++++++++++++ .vscode/settings.json | 2 +- src/device.js | 8 ++++---- 3 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..dd38d51 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,29 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "launch", + "name": "Electron: Main", + "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron", + "runtimeArgs": ["--remote-debugging-port=9223", "."], + "windows": { + "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd" + } + }, + { + "name": "Electron: Renderer", + "type": "chrome", + "request": "attach", + "port": 9223, + "webRoot": "${workspaceFolder}", + "timeout": 30000 + } + ], + "compounds": [ + { + "name": "Electron: All", + "configurations": ["Electron: Main", "Electron: Renderer"] + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json index 3c1a1bb..e0fa2c6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,7 +2,7 @@ "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true, "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, "eslint.validate": ["javascript"], "html.validate.styles": false // accept templates inside HTML style attributes diff --git a/src/device.js b/src/device.js index bd48864..3658f33 100644 --- a/src/device.js +++ b/src/device.js @@ -257,13 +257,13 @@ module.exports.deleteActive = function deleteActive() { if (choice) { if (device.plugin.config.connectionType === 'TCPsocket') { - device.connection.destroy(); + device.connection?.destroy(); } else if (device.plugin.config.connectionType === 'UDPsocket') { - device.connection.close(); + device.connection?.close(); } else if (device.plugin.config.connectionType === 'multicast') { - device.connection.close(); + device.connection?.close(); } else if (device.plugin.config.connectionType.startsWith('osc')) { - device.connection.close(); + device.connection?.close(); } VIEW.removeDeviceFromList(device); delete devices[device.id];