From 70d542a4e6010b9cd49aa5bf8da86e5675149ae2 Mon Sep 17 00:00:00 2001
From: milek7 <me@milek7.pl>
Date: Sat, 8 Dec 2018 13:18:21 +0100
Subject: [PATCH 1/2] FVel6 fix

---
 Train.cpp | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/Train.cpp b/Train.cpp
index 6f370bed..4b67f59f 100644
--- a/Train.cpp
+++ b/Train.cpp
@@ -1031,18 +1031,7 @@ void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Co
 		Train->mvOccupied->BrakeLevelAdd( -Global.brake_speed * Command.time_delta * Train->mvOccupied->BrakeCtrlPosNo );
 	else if (Command.action == GLFW_PRESS && Train->mvOccupied->BrakeHandle != TBrakeHandle::FV4a)
 		Train->set_train_brake( Train->mvOccupied->fBrakeCtrlPos - Global.fBrakeStep );
-
-    if (Command.action == GLFW_RELEASE) {
-        // release
-        if( ( Train->mvOccupied->BrakeCtrlPos == -1 )
-         && ( Train->mvOccupied->BrakeHandle == TBrakeHandle::FVel6 )
-         && ( Train->DynamicObject->Controller != AIdriver )
-         && ( Global.iFeedbackMode < 3 ) ) {
-            // Odskakiwanie hamulce EP
-            Train->set_train_brake( 0 );
-        }
-    }
-    else {
+    else if (Command.action == GLFW_RELEASE) {
         // release
         if( ( Train->mvOccupied->BrakeCtrlPos == -1 )
          && ( Train->mvOccupied->BrakeHandle == TBrakeHandle::FVel6 )

From f31c7972aba48d10aae076d93f17548437453a4b Mon Sep 17 00:00:00 2001
From: milek7 <me@milek7.pl>
Date: Sat, 8 Dec 2018 13:34:04 +0100
Subject: [PATCH 2/2] et40 fix

---
 Train.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Train.cpp b/Train.cpp
index 4b67f59f..4e5953b1 100644
--- a/Train.cpp
+++ b/Train.cpp
@@ -750,6 +750,11 @@ void TTrain::OnCommand_mastercontrollerincrease( TTrain *Train, command_data con
     if( Command.action != GLFW_RELEASE ) {
         // on press or hold
         Train->mvControlled->IncMainCtrl( 1 );
+        Train->m_mastercontrollerinuse = true;
+    }
+    else if (Command.action == GLFW_RELEASE) {
+        // release
+        Train->m_mastercontrollerinuse = false;
     }
 }
 
@@ -768,7 +773,7 @@ void TTrain::OnCommand_mastercontrollerdecrease( TTrain *Train, command_data con
         Train->mvControlled->DecMainCtrl( 1 );
         Train->m_mastercontrollerinuse = true;
     }
-    else {
+    else if (Command.action == GLFW_RELEASE) {
         // release
         Train->m_mastercontrollerinuse = false;
     }
@@ -808,11 +813,6 @@ void TTrain::OnCommand_secondcontrollerincrease( TTrain *Train, command_data con
         else {
             Train->mvControlled->IncScndCtrl( 1 );
         }
-        Train->m_mastercontrollerinuse = true;
-    }
-    else {
-        // release
-        Train->m_mastercontrollerinuse = false;
     }
 }