Merge branch 'release_231224' of https://github.com/fome-tech/fome-fw into release_231224

mck1117 · mck1117 · commit 720a71d8c751 · 2024-02-26T18:00:48.000-08:00
diff --git a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java
@@ -213,7 +213,7 @@ private void connectButtonAction(JComboBox<String> comboSpeeds) {
         }
 
         // Ensure that the bundle matches between the controller and console
-        if (!selectedPort.signature.matchesBundle()) {
+        if (selectedPort.signature != null && !selectedPort.signature.matchesBundle()) {
             int result = JOptionPane.showConfirmDialog(this.frame, "Looks like you're using the wrong console bundle for your controller.\nYou can attempt to proceed, but unexpected behavior may result.\nContinue at your own risk.", "WARNING", JOptionPane.OK_CANCEL_OPTION);
 
             if (result != JOptionPane.OK_OPTION) {

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ private void connectButtonAction(JComboBox<String> comboSpeeds) {`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`// Ensure that the bundle matches between the controller and console`
`216`		`- if (!selectedPort.signature.matchesBundle()) {`
	`216`	`+ if (selectedPort.signature != null && !selectedPort.signature.matchesBundle()) {`
`217`	`217`	`int result = JOptionPane.showConfirmDialog(this.frame, "Looks like you're using the wrong console bundle for your controller.\nYou can attempt to proceed, but unexpected behavior may result.\nContinue at your own risk.", "WARNING", JOptionPane.OK_CANCEL_OPTION);`
`218`	`218`
`219`	`219`	`if (result != JOptionPane.OK_OPTION) {`