diff --git a/src/openttd.h b/src/openttd.h index 38941dcd73..cfffdea43d 100644 --- a/src/openttd.h +++ b/src/openttd.h @@ -51,20 +51,6 @@ extern GameMode _game_mode; extern SwitchMode _switch_mode; extern bool _exit_game; -#if defined(WIN32) -extern bool _in_event_loop_post_crash; - -inline bool InEventLoopPostCrash() -{ - return _in_event_loop_post_crash; -} -#else -inline bool InEventLoopPostCrash() -{ - return false; -} -#endif - /** Modes of pausing we've got */ enum PauseMode : byte { PM_UNPAUSED = 0, ///< A normal unpaused game diff --git a/src/os/windows/crashlog_win.cpp b/src/os/windows/crashlog_win.cpp index 3e545f9fb1..7e4bb2aec4 100644 --- a/src/os/windows/crashlog_win.cpp +++ b/src/os/windows/crashlog_win.cpp @@ -19,7 +19,6 @@ #include "../../gamelog.h" #include "../../saveload/saveload.h" #include "../../video/video_driver.hpp" -#include "../../openttd.h" #include "../../screenshot.h" #include "../../debug.h" #include "../../settings_type.h" @@ -618,8 +617,6 @@ void *_safe_esp = nullptr; static LONG WINAPI ExceptionHandler(EXCEPTION_POINTERS *ep) { - _in_event_loop_post_crash = true; - if (CrashLogWindows::current != nullptr) { CrashLog::AfterCrashLogCleanup(); ExitProcess(2); diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp index 86a77d7cd0..0ca63f2650 100644 --- a/src/os/windows/win32.cpp +++ b/src/os/windows/win32.cpp @@ -38,8 +38,6 @@ #include "../../safeguards.h" -bool _in_event_loop_post_crash; - static bool _has_console; static bool _cursor_disable = true; static bool _cursor_visible = true; @@ -102,7 +100,6 @@ bool LoadLibraryList(Function proc[], const char *dll) void ShowOSErrorBox(const char *buf, bool system) { - _in_event_loop_post_crash = true; MyShowCursor(true); MessageBox(GetActiveWindow(), OTTD2FS(buf), _T("Error!"), MB_ICONSTOP | MB_TASKMODAL); } diff --git a/src/window.cpp b/src/window.cpp index 5c5d855d66..1e67b71401 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -2714,8 +2714,6 @@ bool FocusWindowById(WindowClass cls, WindowNumber number) */ void HandleKeypress(uint keycode, WChar key) { - if (InEventLoopPostCrash()) return; - /* World generation is multithreaded and messes with companies. * But there is no company related window open anyway, so _current_company is not used. */ assert(HasModalProgress() || IsLocalCompany()); @@ -2934,8 +2932,6 @@ static void HandleKeyScrolling() static void MouseLoop(MouseClick click, int mousewheel) { - if (InEventLoopPostCrash()) return; - /* World generation is multithreaded and messes with companies. * But there is no company related window open anyway, so _current_company is not used. */ assert(HasModalProgress() || IsLocalCompany()); @@ -3042,8 +3038,6 @@ static void MouseLoop(MouseClick click, int mousewheel) */ void HandleMouseEvents() { - if (InEventLoopPostCrash()) return; - /* World generation is multithreaded and messes with companies. * But there is no company related window open anyway, so _current_company is not used. */ assert(HasModalProgress() || IsLocalCompany()); @@ -3153,8 +3147,6 @@ static void CheckSoftLimit() */ void InputLoop() { - if (InEventLoopPostCrash()) return; - /* World generation is multithreaded and messes with companies. * But there is no company related window open anyway, so _current_company is not used. */ assert(HasModalProgress() || IsLocalCompany());