X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Flibretro.c;h=4d56356a9dbb05974ff1e6397171fa4834f31376;hb=d9e770393ef9f049a40e34c06b12f0e3435dce46;hp=8382b659af0801d4bdda85b073d79e20e4ba8663;hpb=53e4a7e5cb46ad8589825ec95e15b56614cc54d9;p=pcsx_rearmed.git

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 8382b659..4d56356a 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();