From 4b9fb6b2fcc03223e2c20218154552160c2d7cc9 Mon Sep 17 00:00:00 2001
From: kruland2607 <kruland2607@github.com>
Date: Tue, 4 Jun 2013 10:06:31 -0500
Subject: [PATCH] Open the SimulationEditDialog in the correct mode based on
 button press only try to infer it when double clicking.

---
 .../openrocket/gui/main/SimulationPanel.java   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/core/src/net/sf/openrocket/gui/main/SimulationPanel.java b/core/src/net/sf/openrocket/gui/main/SimulationPanel.java
index bdb8c501d..cf962e6d0 100644
--- a/core/src/net/sf/openrocket/gui/main/SimulationPanel.java
+++ b/core/src/net/sf/openrocket/gui/main/SimulationPanel.java
@@ -102,7 +102,7 @@ public class SimulationPanel extends JPanel {
 					simulationTable.clearSelection();
 					simulationTable.addRowSelectionInterval(n, n);
 					
-					openDialog(sim);
+					openDialog(false, sim);
 				}
 			});
 			this.add(button, "skip 1, gapright para");
@@ -124,7 +124,7 @@ public class SimulationPanel extends JPanel {
 					selection[i] = simulationTable.convertRowIndexToModel(selection[i]);
 					sims[i] = document.getSimulation(selection[i]);
 				}
-				openDialog(sims);
+				openDialog(false, sims);
 			}
 		});
 		this.add(editButton, "gapright para");
@@ -234,7 +234,7 @@ public class SimulationPanel extends JPanel {
 				
 				fireMaintainSelection();
 				
-				openDialog(sim);
+				openDialog(true, sim);
 				
 			}
 		});
@@ -560,15 +560,23 @@ public class SimulationPanel extends JPanel {
 		return simulationTable.getSelectionModel();
 	}
 	
-	private void openDialog(final Simulation... sims) {
+	private void openDialog(boolean plotMode, final Simulation... sims) {
 		SimulationEditDialog d = new SimulationEditDialog(SwingUtilities.getWindowAncestor(this), document, sims);
-		if (sims.length == 1 && sims[0].hasSimulationData()) {
+		if (plotMode) {
 			d.setPlotMode();
 		}
 		d.setVisible(true);
 		fireMaintainSelection();
 	}
 	
+	private void openDialog(final Simulation sim) {
+		boolean plotMode = false;
+		if (sim.hasSimulationData()) {
+			plotMode = true;
+		}
+		openDialog(plotMode, sim);
+	}
+	
 	private void fireMaintainSelection() {
 		int[] selection = simulationTable.getSelectedRows();
 		simulationTableModel.fireTableDataChanged();