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
libretro: Remove reset in retro_run() hack
[pcsx_rearmed.git]
/
frontend
/
libretro.c
diff --git
a/frontend/libretro.c
b/frontend/libretro.c
index
87dcb2d
..
8382b65
100644
(file)
--- a/
frontend/libretro.c
+++ b/
frontend/libretro.c
@@
-932,6
+932,10
@@
static struct retro_disk_control_callback disk_control = {
#define SLASH '/'
#endif
#define SLASH '/'
#endif
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
static char base_dir[PATH_MAX];
static bool read_m3u(const char *file)
static char base_dir[PATH_MAX];
static bool read_m3u(const char *file)
@@
-1304,9
+1308,7
@@
size_t retro_get_memory_size(unsigned id)
void retro_reset(void)
{
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[] = {
}
static const unsigned short retro_psx_map[] = {
@@
-1513,11
+1515,6
@@
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();