From a4d235f805a21871bc3196c915f5d1ab7009641e Mon Sep 17 00:00:00 2001 From: milek7 Date: Sun, 28 Jan 2018 12:28:51 +0100 Subject: [PATCH] brake control fix, skip destructors at exit --- EU07.cpp | 2 ++ Train.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/EU07.cpp b/EU07.cpp index 02cc75a0..355514c3 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -439,5 +439,7 @@ int main(int argc, char *argv[]) glfwDestroyWindow(window); glfwTerminate(); + _exit(0); // skip destructors, there are ordering errors which causes segfaults + return 0; } diff --git a/Train.cpp b/Train.cpp index 5f50ff49..d20c3729 100644 --- a/Train.cpp +++ b/Train.cpp @@ -831,7 +831,7 @@ void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Co Train->mvOccupied->BrakeLevelAdd( -Global::fBrakeStep * Command.time_delta ); } else { - Train->set_train_brake( Train->mvOccupied->BrakeCtrlPos - Global::fBrakeStep * Command.time_delta ); + Train->set_train_brake( Train->mvOccupied->fBrakeCtrlPos - Global::fBrakeStep * Command.time_delta ); } } else if (Command.action == GLFW_RELEASE) {