From 1e435ad2fb0c766c085b3d499cb543dee9aef9c9 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 22 Jan 2022 21:37:19 -0500 Subject: [PATCH] Restart attempts hangs up console fix #3826 --- .../shared_io/src/main/java/com/rusefi/rusEFIVersion.java | 2 +- java_console/ui/src/main/java/com/rusefi/ConsoleUI.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java b/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java index e35348e72c..8197db5120 100644 --- a/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java +++ b/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java @@ -6,7 +6,7 @@ import java.net.URL; import java.util.concurrent.atomic.AtomicReference; public class rusEFIVersion { - public static final int CONSOLE_VERSION = 20220118; + public static final int CONSOLE_VERSION = 20220122; public static AtomicReference firmwareVersion = new AtomicReference<>("N/A"); public static long classBuildTimeMillis() { diff --git a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java index 50ff6e0d50..2e31e646ff 100644 --- a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java +++ b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java @@ -87,8 +87,10 @@ public class ConsoleUI { tabbedPane.addTab("Log Viewer", new LogViewer(uiContext, engineSnifferPanel)); new ConnectionWatchdog(Timeouts.CONNECTION_RESTART_DELAY, () -> { - FileLog.MAIN.logLine("ConnectionWatchdog.reconnectTimer restarting: " + Timeouts.CONNECTION_RESTART_DELAY); - linkManager.restart(); + uiContext.getLinkManager().execute(() -> { + FileLog.MAIN.logLine("ConnectionWatchdog.reconnectTimer restarting: " + Timeouts.CONNECTION_RESTART_DELAY); + linkManager.restart(); + }); }).start(); uiContext.DetachedRepositoryINSTANCE.init(getConfig().getRoot().getChild("detached"));