From d9e770393ef9f049a40e34c06b12f0e3435dce46 Mon Sep 17 00:00:00 2001
From: meepingsnesroms
Date: Wed, 5 Apr 2017 14:50:53 -0700
Subject: These are needed to reset on systems without a keyboard.

It is also not a bug that load state after pushing reset still resets,
this is the only way to make it work for now.

On mac it will actually crash the OS and make you reboot.
---
 frontend/libretro.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'frontend/libretro.c')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 8382b65..4d56356 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -1308,7 +1308,9 @@ size_t retro_get_memory_size(unsigned id)
 
 void retro_reset(void)
 {
-	SysReset();
+   //hack to prevent retroarch freezing when reseting in the menu but not while running with the hot key
+   rebootemu = 1;
+	//SysReset();
 }
 
 static const unsigned short retro_psx_map[] = {
@@ -1515,6 +1517,11 @@ static int min(int a, int b)
 void retro_run(void)
 {
     int i;
+    //SysReset must be run while core is running,Not in menu (Locks up Retroarch)
+    if(rebootemu != 0){
+      rebootemu = 0;
+      SysReset();
+    }
 
 	input_poll_cb();
 
-- 
cgit v1.2.3