From 04163280975bcd04d966dd59f29615c4a56abffd Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Thu, 25 Aug 2022 21:23:52 +0200
Subject: [PATCH] [#1613] Fix auto-calc not working for unequally sized rings

---
 .../sf/openrocket/gui/configdialog/FinSetConfig.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/swing/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java
index ccf4fc0d0..5dc40ecb1 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java
@@ -272,11 +272,15 @@ public abstract class FinSetConfig extends RocketComponentConfig {
 						CenteringRing ring = (CenteringRing) rocketComponent;
 						if (ring.getOuterRadius() > maxRingRad) {
 							maxRingRad = ring.getOuterRadius();
-							rings.clear();
-							rings.add(ring);
-						} else if (ring.getOuterRadius() == maxRingRad) {
-							rings.add(ring);
 						}
+						rings.add(ring);
+					}
+				}
+
+				// Remove rings that are smaller than the maximum inner tube radius
+				for (CenteringRing ring : new ArrayList<>(rings)) {
+					if (ring.getOuterRadius() <= maxTubeRad) {
+						rings.remove(ring);
 					}
 				}