notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
These are needed to reset on systems without a keyboard.
[pcsx_rearmed.git]
/
frontend
/
libretro.c
diff --git
a/frontend/libretro.c
b/frontend/libretro.c
index
8382b65
..
4d56356
100644
(file)
--- a/
frontend/libretro.c
+++ b/
frontend/libretro.c
@@
-1308,7
+1308,9
@@
size_t retro_get_memory_size(unsigned id)
void retro_reset(void)
{
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[] = {
}
static const unsigned short retro_psx_map[] = {
@@
-1515,6
+1517,11
@@
static int min(int a, int b)
void retro_run(void)
{
int i;
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();
input_poll_cb();