From 178755ca90e4fdd05b6ec6674d59904e3cea7754 Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Thu, 16 Feb 2012 19:24:12 +0000 Subject: [PATCH] When downloading burn files, prefer RockSim formatted files of RASP since they appear to be better. In particular there is a RASP file for the AeroTech G76 which contains the incorrect motor designation of G72. --- .../sf/openrocket/android/thrustcurve/DownloadResponse.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java b/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java index c075d53fb..453261044 100644 --- 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()); if ( currentData == null || currentData.getThrustCurveMotor() == null ) { data.put(mbd.getMotorId(),mbd); + } else { + // Prefer RASP motors. + if ( "RockSim".equals(mbd.getFiletype()) && !"RockSim".equals(currentData.getFiletype()) ) { + data.put(mbd.getMotorId(), mbd); + } } }