Fix #5390, crash on Exit on Windows.

This commit is contained in:
Unknown W. Brackets 2014-02-09 17:35:43 -08:00
parent 6de30f5cbd
commit 80704d013e
3 changed files with 5 additions and 2 deletions

View File

@ -139,7 +139,9 @@ static inline void UpdateRunLoop() {
NativeUpdate(input_state);
EndInputState(&input_state);
}
NativeRender();
if (globalUIState != UISTATE_EXIT) {
NativeRender();
}
}
void Core_RunLoop() {

View File

@ -55,7 +55,7 @@ void EmuThread_Stop()
// Already stopped?
{
lock_guard guard(emuThreadLock);
if (emuThread == NULL)
if (emuThread == NULL || emuThreadReady == THREAD_END)
return;
}

View File

@ -104,6 +104,7 @@ bool WindowsHost::InitGL(std::string *error_message)
void WindowsHost::ShutdownGL()
{
GL_Shutdown();
PostMessage(MainWindow::GetHWND(), WM_CLOSE, 0, 0);
}
void WindowsHost::SetWindowTitle(const char *message)