From e6a8c4fc0200db6f535e61ebf4af4a3d4bf0b5f0 Mon Sep 17 00:00:00 2001
From: "SND\\weimingzhi_cp"
 <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Wed, 16 Jun 2010 03:45:53 +0000
Subject: git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@52641
 e17a0e51-4ae3-4d35-97c3-1a29b211df97

---
 libpcsxcore/psxcommon.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'libpcsxcore')

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();
 }
 
-- 
cgit v1.2.3