mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-28 14:02:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issue 1549, issue 1400, a crash when pressing reset while no game were running and better fix for issue 1556

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4451 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
sl1nk3.s 2009-10-22 19:13:22 +00:00
parent 5fb95d0443
commit 833341696b
8 changed files with 85 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp
View file

@ -85,7 +85,7 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle
}
extern bool gShowDebugger;
int OSDChoice = 0, OSDTime = 0, OSDInternalW = 0, OSDInternalH = 0;
int OSDChoice = 0 , OSDTime = 0, OSDInternalW = 0, OSDInternalH = 0;
// ---------------------------------------------------------------------
@ -260,7 +260,8 @@ void OnKeyDown(WPARAM wParam)
case '5':
case '6':
case '7':
OSDMenu(wParam);
if (g_Config.bOSDHotKey)
OSDMenu(wParam);
break;
}
g_VideoInitialize.pKeyPress(LOWORD(wParam), GetAsyncKeyState(VK_SHIFT) != 0, GetAsyncKeyState(VK_CONTROL) != 0);