Merge branch 'crashlog_improvements' into jgrpp

src/os/windows/crashlog_win.cpp

@@ -21,6 +21,7 @@
 #include "../../gamelog.h"
 #include "../../saveload/saveload.h"
 #include "../../video/video_driver.hpp"
+#include "../../openttd.h"
 #if defined(WITH_DEMANGLE)
 #include <cxxabi.h>
 #endif
@@ -532,6 +533,8 @@ void *_safe_esp = NULL;
 
 static LONG WINAPI ExceptionHandler(EXCEPTION_POINTERS *ep)
 {
+	_in_event_loop_post_crash = true;
+
 	if (CrashLogWindows::current != NULL) {
 		CrashLog::AfterCrashLogCleanup();
 		ExitProcess(2);

src/os/windows/win32.cpp

@@ -34,6 +34,8 @@
 #undef strncat
 #undef strncpy
 
+bool _in_event_loop_post_crash;
+
 static bool _has_console;
 static bool _cursor_disable = true;
 static bool _cursor_visible = true;
@@ -82,6 +84,7 @@ 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);
 }