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

[Bugfix] Rolled back the selected=default => new config 'feature'

Browse Source
This commit is contained in:
Daniel_M_Williams 2016-04-15 23:21:19 -04:00
parent fedda3278e
commit df328c1555
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/net/sf/openrocket/rocketcomponent/Rocket.java
View File

@ -566,9 +566,6 @@ public class Rocket extends RocketComponent {
*/ */
public FlightConfiguration getSelectedConfiguration() { public FlightConfiguration getSelectedConfiguration() {
checkState(); checkState();
if( this.selectedConfiguration == this.configSet.getDefault() ){
selectedConfiguration = createFlightConfiguration(null);
}
return selectedConfiguration; return selectedConfiguration;
} }
@ -591,8 +588,9 @@ public class Rocket extends RocketComponent {
} }
/** /**
* Remove a flight configuration ID from the configuration IDs. The <code>null</code> * Remove a flight configuration ID from the configuration IDs. The
* ID cannot be removed, and an attempt to remove it will be silently ignored. * <code>FlightConfigurationId.DEFAULT_VALUE_FCID</code> ID cannot be removed,
* and an attempt to remove it will be silently ignored.
* *
* @param fcid the flight configuration ID to remove * @param fcid the flight configuration ID to remove
*/ */
@ -604,7 +602,7 @@ public class Rocket extends RocketComponent {
// Get current configuration: // Get current configuration:
this.configSet.reset( fcid); this.configSet.reset( fcid);
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE); fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE);
} }