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

Merge pull request #1064 from JoePfeiffer/fix-1007

Browse Source 
Copy stageMap when loading a rocket's parameters from another rocket
This commit is contained in:
SiboVG 2021-12-14 22:37:13 +01:00 committed by GitHub
commit 52314dbc81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/net/sf/openrocket/document/OpenRocketDocument.java
View File

@ -727,9 +727,7 @@ public class OpenRocketDocument implements ComponentChangeListener {
} }
rocket.checkComponentStructure(); rocket.checkComponentStructure();
undoHistory.get(undoPosition).checkComponentStructure(); rocket.loadFrom(undoHistory.get(undoPosition));
undoHistory.get(undoPosition).copyWithOriginalID().checkComponentStructure();
rocket.loadFrom(undoHistory.get(undoPosition).copyWithOriginalID());
rocket.checkComponentStructure(); rocket.checkComponentStructure();
} }

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

@ -387,6 +387,7 @@ public class Rocket extends ComponentAssembly {
this.functionalModID = r.functionalModID; this.functionalModID = r.functionalModID;
this.refType = r.refType; this.refType = r.refType;
this.customReferenceLength = r.customReferenceLength; this.customReferenceLength = r.customReferenceLength;
this.stageMap = r.stageMap;
// these flight configurations need to reference the _this_ Rocket: // these flight configurations need to reference the _this_ Rocket:
this.configSet.setDefault(new FlightConfiguration(this)); this.configSet.setDefault(new FlightConfiguration(this));