summaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorSND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-11-13 19:08:53 +0000
committerSND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-11-13 19:08:53 +0000
commit63813715f8c0d961bccf35faf6abb2287c3ebc0b (patch)
tree3f07e9ef35ccf382c0c3a4ed0b0e7c859442dad1 /gui
parent1068fd8f6ed61fe8eaab07a7ecffe41f697cad9e (diff)
downloadpcsxr-63813715f8c0d961bccf35faf6abb2287c3ebc0b.tar.gz
F12 - reset, a bit buggy.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@59548 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'gui')
-rw-r--r--gui/Plugin.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/gui/Plugin.c b/gui/Plugin.c
index e510aed1..ed687d03 100644
--- a/gui/Plugin.c
+++ b/gui/Plugin.c
@@ -265,7 +265,10 @@ void PADhandleKey(int key) {
LidInterrupt();
break;
- case XK_Escape:
+ case XK_F12:
+ psxReset();
+ break;
+ case XK_Escape:
// TODO
// the architecture is too broken to actually restart the GUI
// because SysUpdate is called from deep within the actual
@@ -289,7 +292,7 @@ void PADhandleKey(int key) {
default:
GPU_keypressed(key);
if (Config.UseNet) NET_keypressed(key);
- }
+ }
}
void OnFile_Exit();