From: Twinaphex <libretro@gmail.com>
Date: Fri, 10 Mar 2017 12:38:45 +0000 (+0100)
Subject: Merge pull request #109 from Kekun/master
X-Git-Tag: r24l~799
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abdcbf00ae6ea14cb85b49de97b4daba00c6dc2e;hp=9096ba886c2c72055d93b7cf9f8f76a2c721c0bd;p=pcsx_rearmed.git

Merge pull request #109 from Kekun/master

libretro: Remove reset in retro_run() hack
---

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 4d56356a..8382b659 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -1308,9 +1308,7 @@ size_t retro_get_memory_size(unsigned id)
 
 void retro_reset(void)
 {
-   //hack to prevent retroarch freezing when reseting in the menu but not while running with the hot key
-   rebootemu = 1;
-	//SysReset();
+	SysReset();
 }
 
 static const unsigned short retro_psx_map[] = {
@@ -1517,11 +1515,6 @@ 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();