diff options
| author | Twinaphex | 2017-03-10 13:38:45 +0100 |
|---|---|---|
| committer | GitHub | 2017-03-10 13:38:45 +0100 |
| commit | abdcbf00ae6ea14cb85b49de97b4daba00c6dc2e (patch) | |
| tree | dcdcc6b8ac1d71eb01218072bcb8c30cd3d6e3a7 | |
| parent | 9096ba886c2c72055d93b7cf9f8f76a2c721c0bd (diff) | |
| parent | 53e4a7e5cb46ad8589825ec95e15b56614cc54d9 (diff) | |
| download | pcsx_rearmed-abdcbf00ae6ea14cb85b49de97b4daba00c6dc2e.tar.gz pcsx_rearmed-abdcbf00ae6ea14cb85b49de97b4daba00c6dc2e.tar.bz2 pcsx_rearmed-abdcbf00ae6ea14cb85b49de97b4daba00c6dc2e.zip | |
Merge pull request #109 from Kekun/master
libretro: Remove reset in retro_run() hack
| -rw-r--r-- | frontend/libretro.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/frontend/libretro.c b/frontend/libretro.c index 4d56356..8382b65 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(); |