From 01b826c32f49d386aaa2c3f9188a3127b4b02ec1 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 30 May 2014 22:46:47 +0200 Subject: [PATCH] (D3D PC) Properly implement WM_DESTROY again --- gfx/context/d3d_ctx.cpp | 6 +----- gfx/d3d9/d3d.cpp | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/gfx/context/d3d_ctx.cpp b/gfx/context/d3d_ctx.cpp index 8995fa4bd4..696ee8841f 100644 --- a/gfx/context/d3d_ctx.cpp +++ b/gfx/context/d3d_ctx.cpp @@ -86,11 +86,7 @@ LRESULT CALLBACK WindowProc(HWND hWnd, UINT message, return win32_handle_keyboard_event(hWnd, message, wParam, lParam); case WM_DESTROY: - //TODO - We can't set d3d_quit to true here since WM_DESTROY might be invoked - //on tear-down/setup, and we would exit straight away immediately - // - //Right now, quit button of window is broken because of this. - //d3d_quit = true; + d3d_quit = true; return 0; case WM_SIZE: unsigned new_width, new_height; diff --git a/gfx/d3d9/d3d.cpp b/gfx/d3d9/d3d.cpp index d2659dc86d..e428d9bb41 100644 --- a/gfx/d3d9/d3d.cpp +++ b/gfx/d3d9/d3d.cpp @@ -835,7 +835,7 @@ static bool d3d_alive(void *data) else if (resize) d3d->should_resize = true; - return !d3d->quitting; + return !quit; } static bool d3d_focus(void *data)