From 46fca4399699cfc03a5036b0aa54d6899073b3a1 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 18 Sep 2021 16:47:16 -0400 Subject: [PATCH] lua panel NPE fix --- .../shared_io/src/main/java/com/rusefi/rusEFIVersion.java | 2 +- .../ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 bfa90ee396..9b3c9f58ca 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 = 20210911; + public static final int CONSOLE_VERSION = 20210918; public static AtomicReference firmwareVersion = new AtomicReference<>("N/A"); public static long classBuildTimeMillis() { diff --git a/java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java index 38cf38346c..1c0816fb62 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java @@ -97,6 +97,10 @@ public class LuaScriptPanel { } ConfigurationImage image = bp.getControllerConfiguration(); + if (image == null) { + scriptText.setText("No configuration image"); + return; + } ByteBuffer luaScriptBuffer = image.getByteBuffer(Fields.luaScript_offset, Fields.LUA_SCRIPT_SIZE); byte[] scriptArr = new byte[Fields.LUA_SCRIPT_SIZE];