Merge pull request #5252 from Scoppio/fix-npe-missing-person-skill

fix: adds null check before accessing skill property
MegaMek · Nov 29, 2024 · 0f0c41b · 0f0c41b
2 parents 8c19ce2 + 318ec88
commit 0f0c41b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java b/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java
@@ -2169,7 +2169,8 @@ protected Optional<JPopupMenu> createPopupMenu() {
                         if (specialistMenu.getMenuComponentCount() > 0) {
                             abMenu.add(specialistMenu);
                         }
-                    } else if ((person.getOptions().getOption(spa.getName()).getType() == IOption.CHOICE)
+                    } else if (Optional.ofNullable((person.getOptions().getOption(spa.getName()))).isPresent()
+                            && (person.getOptions().getOption(spa.getName()).getType() == IOption.CHOICE)
                             && !(person.getOptions().getOption(spa.getName()).booleanValue())) {
                         JMenu specialistMenu = new JMenu(spa.getDisplayName());
                         List<String> choices = spa.getChoiceValues();