From 6ff6265c3adbd8f08df4d659d42d1c8a120bc44e Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Sun, 31 Jul 2022 10:33:23 +0200
Subject: [PATCH] Fix motors, recovery & stage not properly highlighting

---
 swing/src/net/sf/openrocket/gui/main/SimulationPanel.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
index 3dc3b7e1a..c8c08b870 100644
--- a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
@@ -302,6 +302,7 @@ public class SimulationPanel extends JPanel {
 		}
 
 		fireMaintainSelection();
+		takeTheSpotlight();
 
 		openDialog(true, sim);
 	}
@@ -363,6 +364,7 @@ public class SimulationPanel extends JPanel {
 				SimulationPanel.this), document, sims).setVisible(true);
 		log.info("Running simulations took " + (System.currentTimeMillis() - t) + " ms");
 		fireMaintainSelection();
+		takeTheSpotlight();
 	}
 
 	public void editSimulation() {
@@ -499,6 +501,7 @@ public class SimulationPanel extends JPanel {
 		}
 		d.setVisible(true);
 		fireMaintainSelection();
+		takeTheSpotlight();
 	}
 
 	private void openDialog(final Simulation sim) {
@@ -518,7 +521,6 @@ public class SimulationPanel extends JPanel {
 				break;
 			simulationTable.addRowSelectionInterval(row, row);
 		}
-		takeTheSpotlight();
 	}
 
 	private abstract static class SimulationAction extends AbstractAction {
@@ -1003,6 +1005,9 @@ public class SimulationPanel extends JPanel {
 	 */
 	public void takeTheSpotlight() {
 		simulationTable.requestFocusInWindow();
+		if (simulationTable.getSelectedRows().length > 0) {
+			return;
+		}
 		if (previousSelection == null || previousSelection.length == 0) {
 			simulationTable.setRowSelectionInterval(0, 0);
 		} else {