Merge pull request #6468 from Scoppio/fix/npe-clicking-on-board-no-un…

…it-selected Fix/npe clicking on board no unit selected
MegaMek · Jan 31, 2025 · 48c3552 · 48c3552
2 parents 91a6871 + 6805c5a
commit 48c3552
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/megamek/src/megamek/client/ui/swing/MovementDisplay.java b/megamek/src/megamek/client/ui/swing/MovementDisplay.java
@@ -4668,6 +4668,10 @@ private void computeCFWarningHexes(Entity ce) {
     @Override
     public synchronized void actionPerformed(ActionEvent ev) {
         final Entity ce = ce();
+        final String actionCmd = ev.getActionCommand();
+        if (actionCmd.equals(MoveCommand.MOVE_NEXT.getCmd())) {
+            selectEntity(clientgui.getClient().getNextEntityNum(currentEntity));
+        }
 
         if (ce == null) {
             return;
@@ -4681,7 +4685,6 @@ public synchronized void actionPerformed(ActionEvent ev) {
             // odd...
             return;
         }
-        final String actionCmd = ev.getActionCommand();
         final IGameOptions opts = clientgui.getClient().getGame().getOptions();
         if (actionCmd.equals(MoveCommand.MOVE_NEXT.getCmd())) {
             selectEntity(clientgui.getClient().getNextEntityNum(currentEntity));