summaryrefslogtreecommitdiff
path: root/libpcsxcore/psxcommon.c
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-06-16 03:45:53 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-06-16 03:45:53 +0000
commite6a8c4fc0200db6f535e61ebf4af4a3d4bf0b5f0 (patch)
tree2423a5ae4d4cdd72711a9ec29892f7b6ba23692e /libpcsxcore/psxcommon.c
parentdb58fd45dea16d5ee70ae04dbe2c6b25dc2c7b4e (diff)
downloadpcsxr-e6a8c4fc0200db6f535e61ebf4af4a3d4bf0b5f0.tar.gz
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@52641 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore/psxcommon.c')
-rw-r--r--libpcsxcore/psxcommon.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libpcsxcore/psxcommon.c b/libpcsxcore/psxcommon.c
index 5be8f4d2..a173eceb 100644
--- a/libpcsxcore/psxcommon.c
+++ b/libpcsxcore/psxcommon.c
@@ -51,7 +51,10 @@ void EmuShutdown() {
}
void EmuUpdate() {
- SysUpdate();
+ // Do not allow hotkeys inside a softcall from HLE BIOS
+ if (!Config.HLE || psxRegs.GPR.n.ra != 0x80001000)
+ SysUpdate();
+
ApplyCheats();
}