From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Mon, 4 Jun 2012 18:59:45 +0000 (+0000)
Subject: Fix a bug where the motor configuration was not being pulled correctly.  It is stored... 
X-Git-Tag: upstream/12.09^2~209
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=e2f1fd0c41523f0e93bd68fd8b0b5011cd0d286b;p=debian%2Fopenrocket

Fix a bug where the motor configuration was not being pulled correctly.  It is stored in the options.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@746 180e2498-e6e9-4542-8430-84ac67f01cd8
---

diff --git a/android/src/net/sf/openrocket/android/rocket/Simulations.java b/android/src/net/sf/openrocket/android/rocket/Simulations.java
index 019accdd..e121cdaf 100644
--- a/android/src/net/sf/openrocket/android/rocket/Simulations.java
+++ b/android/src/net/sf/openrocket/android/rocket/Simulations.java
@@ -127,7 +127,8 @@ implements SharedPreferences.OnSharedPreferenceChangeListener
 				Simulation sim = this.getItem(position);
 				((TextView)v.findViewById(android.R.id.text1)).setText( sim.getName() );
 				StringBuilder sb = new StringBuilder();
-				sb.append("motors: ").append(sim.getConfiguration().getMotorConfigurationDescription());
+				String motorConfig = sim.getOptions().getMotorConfigurationID();
+				sb.append("motors: ").append(rocketDocument.getRocket().getMotorConfigurationNameOrDescription(motorConfig));
 				Unit distanceUnit = UnitGroup.UNITS_DISTANCE.getDefaultUnit();
 				FlightData flightData  = sim.getSimulatedData();
 				if ( flightData != null ) {