When downloading burn files, prefer RockSim formatted files of RASP since they appear...

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

diff --git a/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java b/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java
index c075d53fb1d10f669c27792877d9da2faddfc510..4532610442134f9855e9ad169775f0a36db1df79 100644 (file)
--- a/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java
+++ b/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java
@@ -14,6 +14,11 @@ public class DownloadResponse {
                MotorBurnFile currentData = data.get(mbd.getMotorId());\r
                if ( currentData == null || currentData.getThrustCurveMotor() == null ) {\r
                        data.put(mbd.getMotorId(),mbd);\r
+               } else {\r
+                       // Prefer RASP motors.\r
+                       if ( "RockSim".equals(mbd.getFiletype()) && !"RockSim".equals(currentData.getFiletype()) ) {\r
+                               data.put(mbd.getMotorId(), mbd);\r
+                       }\r
                }\r
        }\r
 \r