From 53e4a7e5cb46ad8589825ec95e15b56614cc54d9 Mon Sep 17 00:00:00 2001 From: Adrien Plazas Date: Fri, 10 Mar 2017 07:24:33 +0100 Subject: [PATCH] libretro: Remove reset in retro_run() hack Removes a hack breaking deserialization when running retro_reset(), retro_unserialize() and retro_run() in this order, as it silently resets the core just after setting its state. --- frontend/libretro.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) 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(); -- 2.39.5