From 994f29ab67f3ddc8548bce14cac815858ce45786 Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 6 Oct 2024 10:41:17 +0200 Subject: [PATCH 1/2] fix NPE in ScenarioChooser --- .../megamek/client/ui/swing/scenario/ScenarioChooser.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/megamek/src/megamek/client/ui/swing/scenario/ScenarioChooser.java b/megamek/src/megamek/client/ui/swing/scenario/ScenarioChooser.java index 13aa9398c6..1623183cfe 100644 --- a/megamek/src/megamek/client/ui/swing/scenario/ScenarioChooser.java +++ b/megamek/src/megamek/client/ui/swing/scenario/ScenarioChooser.java @@ -91,10 +91,12 @@ public ScenarioChooser(final JFrame parentFrame) { return scenarioFileName; } Component selectedTab = tabbedPane.getSelectedComponent(); - if (!(selectedTab instanceof ScenarioInfoPane) || !getResult().isConfirmed()) { + if (!(selectedTab instanceof ScenarioInfoPane selectedPane) || !getResult().isConfirmed()) { return null; + } else if (selectedPane.getSelectedPreset() != null) { + return selectedPane.getSelectedPreset().getFileName(); } else { - return ((ScenarioInfoPane) selectedTab).getSelectedPreset().getFileName(); + return null; } } From 77924f459cc2830703b8ab8c4093d574a89d5ba4 Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 6 Oct 2024 10:41:59 +0200 Subject: [PATCH 2/2] remove unused import --- .../src/megamek/client/ui/swing/scenario/ScenarioChooser.java | 1 - 1 file changed, 1 deletion(-) diff --git a/megamek/src/megamek/client/ui/swing/scenario/ScenarioChooser.java b/megamek/src/megamek/client/ui/swing/scenario/ScenarioChooser.java index 1623183cfe..b5744d0483 100644 --- a/megamek/src/megamek/client/ui/swing/scenario/ScenarioChooser.java +++ b/megamek/src/megamek/client/ui/swing/scenario/ScenarioChooser.java @@ -49,7 +49,6 @@ import megamek.client.ui.swing.CommonSettingsDialog; import megamek.client.ui.swing.dialog.DialogButton; import megamek.client.ui.swing.util.ClickableLabel; -import megamek.client.ui.swing.util.UIUtil; import megamek.common.Configuration; import megamek.common.annotations.Nullable; import megamek.common.preference.PreferenceManager;