Fix crash when toggling rotation damping during follow-orient mode

pioneerspacesim · Feb 1, 2025 · be7f603 · be7f603
1 parent 7678c7e
commit be7f603
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/ship/PlayerShipController.cpp b/src/ship/PlayerShipController.cpp
@@ -708,7 +708,8 @@ void PlayerShipController::PollControls(const float timeStep, int *mouseMotion,
 		wantAngVel += Util::NeededAngVelocityToFaceDirection(*this, timeStep, GetMouseDir(), outParams.angPower);
 	}
 
-	if (InputBindings.killRot->IsActive()) SetFlightControlState(CONTROL_FIXHEADING_KILLROT);
+	if (InputBindings.killRot->IsActive() && GetFlightControlState() != CONTROL_FIXSPEED)
+		SetFlightControlState(CONTROL_FIXHEADING_KILLROT);
 
 	outParams.desiredAngular = wantAngVel;