From 47d4f7c0b12bcecb13cfe44e417db5dc60d7a054 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Mon, 7 Nov 2022 00:06:58 +0100
Subject: [PATCH] [#1791] Return component mass as section mass if
 subcomponents mass is overridden

---
 .../src/net/sf/openrocket/rocketcomponent/RocketComponent.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
index 11f2fbb1a..5235a92cd 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
@@ -1534,6 +1534,9 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 	 */
 	public final double getSectionMass() {
 		Double massSubtotal = getMass();
+		if (massOverridden && overrideSubcomponentsMass) {
+			return massSubtotal;
+		}
 		mutex.verify();
 		for (RocketComponent rc : children) {
 			massSubtotal += rc.getSectionMass();