zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-29 07:22:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2016-05-28 20:33:29 +02:00
commit 4940f0249d
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/win32/i_crash.cpp
View file

@ -284,6 +284,7 @@ struct MiniDumpThreadData
// EXTERNAL FUNCTION PROTOTYPES -------------------------------------------- // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
// PUBLIC FUNCTION PROTOTYPES ---------------------------------------------- // PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
void I_FlushBufferedConsoleStuff();
// PRIVATE FUNCTION PROTOTYPES --------------------------------------------- // PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
@ -679,6 +680,7 @@ void CreateCrashLog (char *custominfo, DWORD customsize, HWND richlog)
} }
if (richlog != NULL) if (richlog != NULL)
{ {
I_FlushBufferedConsoleStuff();
AddFile (WriteLogFile(richlog), "log.rtf"); AddFile (WriteLogFile(richlog), "log.rtf");
} }
CloseHandle (DbgProcess); CloseHandle (DbgProcess);

2
src/win32/i_main.cpp
View file

@ -681,7 +681,6 @@ void RestoreConView()
ConWindowHidden = false; ConWindowHidden = false;
ShowWindow (GameTitleWindow, SW_SHOW); ShowWindow (GameTitleWindow, SW_SHOW);
I_ShutdownInput (); // Make sure the mouse pointer is available. I_ShutdownInput (); // Make sure the mouse pointer is available.
I_FlushBufferedConsoleStuff();
// Make sure the progress bar isn't visible. // Make sure the progress bar isn't visible.
if (StartScreen != NULL) if (StartScreen != NULL)
{ {
@ -1029,6 +1028,7 @@ void DoMain (HINSTANCE hInstance)
{ {
I_ShutdownGraphics (); I_ShutdownGraphics ();
RestoreConView (); RestoreConView ();
I_FlushBufferedConsoleStuff();
if (error.GetMessage ()) if (error.GetMessage ())
{ {
if (!batchrun) if (!batchrun)