hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix implementation of copyFlightConfiguration to account for copying a

Browse Source 
configuration which doesn't exist for this component.
This commit is contained in:
kruland2607 2012-10-19 16:04:36 -05:00
parent 8588918452
commit 4625ca94b6
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/net/sf/openrocket/rocketcomponent/BaseMotorMount.java
View File

@ -26,7 +26,10 @@ class BaseMotorMount implements SupportsFlightConfiguration<MotorConfiguration>,
@Override @Override
public void cloneFlightConfiguration(String oldConfigId, String newConfigId) { public void cloneFlightConfiguration(String oldConfigId, String newConfigId) {
MotorConfiguration oldConfig = getFlightConfiguration(oldConfigId); MotorConfiguration oldConfig = getFlightConfiguration(oldConfigId);
setFlightConfiguration(newConfigId, oldConfig.clone()); if ( oldConfig != null ) {
oldConfig = oldConfig.clone();
}
setFlightConfiguration(newConfigId, oldConfig);
} }
@Override @Override

5
core/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java
View File

@ -143,7 +143,10 @@ public abstract class RecoveryDevice extends MassObject implements SupportsFligh
@Override @Override
public void cloneFlightConfiguration( String oldConfigId, String newConfigId ) { public void cloneFlightConfiguration( String oldConfigId, String newConfigId ) {
DeploymentConfiguration oldConfig = getFlightConfiguration(oldConfigId); DeploymentConfiguration oldConfig = getFlightConfiguration(oldConfigId);
setFlightConfiguration( newConfigId, oldConfig.clone() ); if ( oldConfig != null ) {
oldConfig = oldConfig.clone();
}
setFlightConfiguration( newConfigId, oldConfig );
} }
public DeployEvent getDefaultDeployEvent() { public DeployEvent getDefaultDeployEvent() {