ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OGL: allow the Esc button to work while windowed and not rendering to main 

D3D: fix the wireframe option getting enabled when using the fullscreen option
and did some code cleanup

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4555 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
luisr142004 2009-11-13 10:45:41 +00:00
parent 928dc99874
commit 654800458f
2 changed files with 37 additions and 1534 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1569
Source/Plugins/Plugin_VideoDX9/Src/resource.h
View File

File diff suppressed because it is too large Load Diff

2
Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp
View File

@ -244,7 +244,7 @@ void OnKeyDown(WPARAM wParam)
switch (LOWORD( wParam )) switch (LOWORD( wParam ))
{ {
case VK_ESCAPE: case VK_ESCAPE:
if (g_Config.bFullscreen && !g_Config.RenderToMainframe) if (!g_Config.RenderToMainframe)
{ {
// Pressing Esc stops the emulation // Pressing Esc stops the emulation
SendMessage( m_hWnd, WM_CLOSE, 0, 0 ); SendMessage( m_hWnd, WM_CLOSE, 0, 0 );