From 977dac264cea0e4f85feba423dcd4344704027de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= <bunny@awril.pl>
Date: Sat, 19 Oct 2019 22:14:29 +0200
Subject: [PATCH] Speed Control Unit does not override emergency braking

---
 McZapkie/Mover.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp
index 4bf691a5..41edac64 100644
--- a/McZapkie/Mover.cpp
+++ b/McZapkie/Mover.cpp
@@ -3987,7 +3987,7 @@ void TMoverParameters::UpdatePipePressure(double dt)
              || ( ( BrakeHandle != TBrakeHandle::MHZ_EN57 )
                && ( BrakeHandle != TBrakeHandle::MHZ_K8P ) ) ) {
 				double pos = BrakeCtrlPosR;
-				if (SpeedCtrlUnit.IsActive && SpeedCtrlUnit.BrakeIntervention && !SpeedCtrlUnit.Standby) {
+				if (SpeedCtrlUnit.IsActive && SpeedCtrlUnit.BrakeIntervention && !SpeedCtrlUnit.Standby && (BrakeCtrlPos != Handle->GetPos(bh_EB))) {
 					pos = Handle->GetPos(bh_NP);
 					if (SpeedCtrlUnit.BrakeInterventionBraking)
 						pos = Handle->GetPos(bh_FB);