From d8a1de26526af14dd962e38a2b3c738180f0fc3e Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Sat, 25 Jun 2022 01:03:09 +0200
Subject: [PATCH] Include non-active booster condition

---
 core/src/net/sf/openrocket/rocketcomponent/AxialStage.java    | 3 +--
 core/src/net/sf/openrocket/rocketcomponent/ParallelStage.java | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/src/net/sf/openrocket/rocketcomponent/AxialStage.java b/core/src/net/sf/openrocket/rocketcomponent/AxialStage.java
index e4ff3bb7c..8e0f533c5 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/AxialStage.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/AxialStage.java
@@ -134,8 +134,7 @@ public class AxialStage extends ComponentAssembly implements FlightConfigurableC
 	 * @return	if the object is a launch stage
 	 */
 	public boolean isLaunchStage(FlightConfiguration config) {
-		return ((this instanceof ParallelStage && config.isStageActive(this.stageNumber))
-				||( getRocket().getBottomCoreStage(config).equals(this)));
+		return (getRocket().getBottomCoreStage(config).equals(this));
 	}
 
 	/**
diff --git a/core/src/net/sf/openrocket/rocketcomponent/ParallelStage.java b/core/src/net/sf/openrocket/rocketcomponent/ParallelStage.java
index 8f74ee6fa..d09b71f54 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/ParallelStage.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/ParallelStage.java
@@ -111,8 +111,8 @@ public class ParallelStage extends AxialStage implements FlightConfigurableCompo
 	}
 	
 	@Override
-	public boolean isLaunchStage(){
-		return true;
+	public boolean isLaunchStage(FlightConfiguration config) {
+		return config.isStageActive(this.stageNumber);
 	}
 
 	@Override