andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

another threading bugfix

This commit is contained in:
rusefi 2024-10-04 12:06:41 -04:00
parent 7ae0fcedb7
commit ea73f80a06
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/autoupdate/src/main/java/com/rusefi/autoupdate/Autoupdate.java
View File

@ -34,7 +34,7 @@ import static com.rusefi.core.FindFileHelper.findSrecFile;
public class Autoupdate { public class Autoupdate {
private static final Logging log = getLogging(Autoupdate.class); private static final Logging log = getLogging(Autoupdate.class);
private static final int AUTOUPDATE_VERSION = 20240918; // separate from rusEFIVersion#CONSOLE_VERSION private static final int AUTOUPDATE_VERSION = 20241004; // separate from rusEFIVersion#CONSOLE_VERSION
private static final String LOGO_PATH = "/com/rusefi/"; private static final String LOGO_PATH = "/com/rusefi/";
private static final String LOGO = LOGO_PATH + "logo.png"; private static final String LOGO = LOGO_PATH + "logo.png";

16
java_console/core_ui/src/main/java/com/rusefi/core/ui/AutoupdateUtil.java
View File

@ -8,10 +8,12 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.io.*; import java.io.*;
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.Date; import java.util.Date;
import java.util.concurrent.atomic.AtomicReference;
public class AutoupdateUtil { public class AutoupdateUtil {
public static final boolean runHeadless = Boolean.getBoolean("run_headless") || GraphicsEnvironment.isHeadless(); public static final boolean runHeadless = Boolean.getBoolean("run_headless") || GraphicsEnvironment.isHeadless();
@ -26,7 +28,7 @@ public class AutoupdateUtil {
return result; return result;
} }
private static ProgressView createProgressView(String title) { private static ProgressView doCreateProgressView(String title) {
if (runHeadless) { if (runHeadless) {
return new ProgressView(null, null); return new ProgressView(null, null);
} else { } else {
@ -64,6 +66,18 @@ public class AutoupdateUtil {
} }
} }
private static ProgressView createProgressView(String title) {
AtomicReference<ProgressView> result = new AtomicReference<>();
try {
SwingUtilities.invokeAndWait(() -> result.set(doCreateProgressView(title)));
} catch (InterruptedException e) {
throw new RuntimeException(e);
} catch (InvocationTargetException e) {
throw new RuntimeException(e);
}
return result.get();
}
private static class DynamicForResourcesURLClassLoader extends URLClassLoader { private static class DynamicForResourcesURLClassLoader extends URLClassLoader {
public DynamicForResourcesURLClassLoader(ClassLoader parent ) { public DynamicForResourcesURLClassLoader(ClassLoader parent ) {
super(new URL[ 0 ], parent ); super(new URL[ 0 ], parent );