From 6a2735d24ed54158b93eac217e803dcd89f67a9e Mon Sep 17 00:00:00 2001 From: michi_cc Date: Fri, 4 Nov 2011 23:47:00 +0000 Subject: (svn r23119) -Fix: [Win32] Don't show a crash/assertion message box for a GUI-less video driver. --- src/os/windows/crashlog_win.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/os/windows/crashlog_win.cpp') diff --git a/src/os/windows/crashlog_win.cpp b/src/os/windows/crashlog_win.cpp index a02ca3c2d..2230203bf 100644 --- a/src/os/windows/crashlog_win.cpp +++ b/src/os/windows/crashlog_win.cpp @@ -25,6 +25,7 @@ #include "../../strings_func.h" #include "../../gamelog.h" #include "../../saveload/saveload.h" +#include "../../video/video_driver.hpp" #include #include @@ -526,7 +527,7 @@ static LONG WINAPI ExceptionHandler(EXCEPTION_POINTERS *ep) /* Close any possible log files */ CloseConsoleLogIfActive(); - if (_safe_esp != NULL) { + if ((_video_driver == NULL || _video_driver->HasGUI()) && _safe_esp != NULL) { #ifdef _M_AMD64 ep->ContextRecord->Rip = (DWORD64)ShowCrashlogWindow; ep->ContextRecord->Rsp = (DWORD64)_safe_esp; -- cgit v1.2.3-70-g09d2