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

Fix stackoverflow on prev/next comp checking

Browse Source
This commit is contained in:
SiboVG 2023-03-19 22:32:31 +01:00
parent 9ef59ec6af
commit 7666cbb680
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/net/sf/openrocket/rocketcomponent/SymmetricComponent.java
View File

@ -707,7 +707,9 @@ public abstract class SymmetricComponent extends BodyComponent implements BoxBou
// It could be that there is a child component assembly that is flush with the end of the parent or larger // It could be that there is a child component assembly that is flush with the end of the parent or larger
// Recursively check assembly's children // Recursively check assembly's children
previousComponent = getPreviousSymmetricComponentFromComponentAssembly(lastSymmetricChild, previousComponent, flushDeviation); previousComponent = getPreviousSymmetricComponentFromComponentAssembly(lastSymmetricChild, previousComponent, flushDeviation);
maxRadius = previousComponent != null ? previousComponent.getAftRadius() : maxRadius; if (previousComponent != null && !previousComponent.isAftRadiusAutomatic()) {
maxRadius = previousComponent.getAftRadius();
}
} }
return previousComponent; return previousComponent;
@ -826,7 +828,9 @@ public abstract class SymmetricComponent extends BodyComponent implements BoxBou
// It could be that there is a child component assembly that is flush with the front of the parent or larger // It could be that there is a child component assembly that is flush with the front of the parent or larger
// Recursively check assembly's children // Recursively check assembly's children
nextComponent = getNextSymmetricComponentFromComponentAssembly(firstSymmetricChild, nextComponent, flushDeviation); nextComponent = getNextSymmetricComponentFromComponentAssembly(firstSymmetricChild, nextComponent, flushDeviation);
maxRadius = nextComponent != null ? nextComponent.getForeRadius() : maxRadius; if (nextComponent != null && !nextComponent.isForeRadiusAutomatic()) {
maxRadius = nextComponent.getForeRadius();
}
} }
return nextComponent; return nextComponent;