From 6ada059231f9b2d17da99edfe325f7c25bbc7c16 Mon Sep 17 00:00:00 2001 From: Hydra Date: Sun, 9 Apr 2017 18:57:32 +0100 Subject: [PATCH] CF/BF - Fix failure to reconnect when disconnect occurs with the CLI tab open. --- js/serial_backend.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/js/serial_backend.js b/js/serial_backend.js index 37f5cf5a..378cf038 100755 --- a/js/serial_backend.js +++ b/js/serial_backend.js @@ -61,12 +61,11 @@ $(document).ready(function () { GUI.tab_switch_cleanup(); GUI.tab_switch_in_progress = false; + var wasConnected = CONFIGURATOR.connectionValid; + serial.disconnect(onClosed); - var wasConnected = CONFIGURATOR.connectionValid; - GUI.connected_to = false; - CONFIGURATOR.connectionValid = false; GUI.allowedTabs = GUI.defaultAllowedTabsWhenDisconnected.slice(); MSP.disconnect_cleanup(); PortUsage.reset(); @@ -339,6 +338,9 @@ function onClosed(result) { battery.hide(); MSP.clearListeners(); + + CONFIGURATOR.connectionValid = false; + CONFIGURATOR.cliActive = false; } function read_serial(info) {