From 51a7acdbb2785270de440212f7c7e652b2d7fdea Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Sat, 7 Oct 2023 18:46:19 -0400
Subject: [PATCH] Too much of "Looks like another instance is already running."
 #5584

---
 .../src/main/java/com/rusefi/core/rusEFIVersion.java   |  2 +-
 .../src/main/java/com/rusefi/ui/util/UiUtils.java      | 10 ++++++++++
 .../ui/src/main/java/com/rusefi/ConsoleUI.java         |  3 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java b/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java
index 3623935510..c3a8a23b79 100644
--- a/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java
+++ b/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java
@@ -6,7 +6,7 @@ import java.net.URL;
 import java.util.concurrent.atomic.AtomicReference;
 
 public interface rusEFIVersion {
-    int CONSOLE_VERSION = 20230930;
+    int CONSOLE_VERSION = 20231007;
     AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A");
 
     static long classBuildTimeMillis() {
diff --git a/java_console/trigger-ui/src/main/java/com/rusefi/ui/util/UiUtils.java b/java_console/trigger-ui/src/main/java/com/rusefi/ui/util/UiUtils.java
index ef7f19e8f9..5338b9c702 100644
--- a/java_console/trigger-ui/src/main/java/com/rusefi/ui/util/UiUtils.java
+++ b/java_console/trigger-ui/src/main/java/com/rusefi/ui/util/UiUtils.java
@@ -74,6 +74,16 @@ public class UiUtils {
         pauseButton.setText((isPaused ? RESUME.getMessage() : PAUSE.getMessage()) + suffix);
     }
 
+    /**
+     * problem: say we are downloading auto-update and remove progress bar window from front.
+     * Special considerations are required for a popup dialog to get to front of display
+     */
+    public static JDialog createOnTopParent() {
+        JDialog dialog = new JDialog();
+        dialog.setAlwaysOnTop(true);
+        return dialog;
+    }
+
     public static void centerWindow(Window w) {
         w.pack();
         Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
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 98a04bbbb4..ee8ade3bd6 100644
--- a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
+++ b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
@@ -33,6 +33,7 @@ import static com.devexperts.logging.Logging.getLogging;
 import static com.rusefi.StartupFrame.setFrameIcon;
 import static com.rusefi.core.preferences.storage.PersistentConfiguration.getConfig;
 import static com.rusefi.core.rusEFIVersion.CONSOLE_VERSION;
+import static com.rusefi.ui.util.UiUtils.createOnTopParent;
 
 /**
  * @see StartupFrame
@@ -205,7 +206,7 @@ public class ConsoleUI {
 
     private static void awtCode(String[] args) {
         if (JustOneInstance.isAlreadyRunning()) {
-            int result = JOptionPane.showConfirmDialog(null, "Looks like another instance is already running. Do you really want to start another instance?",
+            int result = JOptionPane.showConfirmDialog(createOnTopParent(), "Looks like another instance is already running. Do you really want to start another instance?",
                     "rusEfi", JOptionPane.YES_NO_OPTION);
             if (result == JOptionPane.NO_OPTION)
                 System.exit(-1);