piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix a crash when closing DirectX's window, also apply a fix from j4ck.fr0st/BhaaL @ issue 1277 to prevent two possibles hang on stop.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4756 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
sl1nk3.s
2009-12-30 15:08:18 +00:00
parent 151ff28ab7
commit 18e951f97a
6 changed files with 35 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Plugins/Plugin_VideoDX9/Src/EmuWindow.cpp
View File

@ -84,13 +84,14 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
}
break;
}
// Tell the hotkey function that this key was pressed
g_VideoInitialize.pKeyPress(LOWORD(wParam), GetAsyncKeyState(VK_SHIFT) != 0, GetAsyncKeyState(VK_CONTROL) != 0);
break;
/*
case WM_SYSKEYDOWN:
switch( LOWORD( wParam ))
{
case VK_RETURN: // Pressing Esc switch FullScreen/Windowed
case VK_RETURN: // Pressing Alt+Enter switch FullScreen/Windowed
if (g_ActiveConfig.bFullscreen)
{
DestroyWindow(hWnd);
@ -112,26 +113,15 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
break;
case WM_CLOSE:
Fifo_ExitLoopNonBlocking();
//Shutdown();
// Simple hack to easily exit without stopping. Hope to fix the stopping errors soon.
//ExitProcess(0);
// When the user closes the window, we post an event to the main window to call Stop()
// Which then handles all the necessary steps to Shutdown the core + the plugins
PostMessage( m_hMain, WM_USER, WM_USER_STOP, 0 );
return 0;
case WM_DESTROY:
//Shutdown();
//PostQuitMessage( 0 );
break;
case WM_USER:
// if (wParam == TOGGLE_FULLSCREEN)
// TODO : Insert some toggle fullscreen code here, kthx :d
break;
case WM_SIZE:
// Reset the D3D Device here
// Also make damn sure that this is not called from inside rendering a frame :P
// Renderer::ReinitView();
// see TODO ^ upper
break;
case WM_SYSCOMMAND: