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
frontend: remove bad configs
[pcsx_rearmed.git]
/
frontend
/
common
/
menu.c
diff --git
a/frontend/common/menu.c
b/frontend/common/menu.c
index
22a66ea
..
aa76e43
100644
(file)
--- a/
frontend/common/menu.c
+++ b/
frontend/common/menu.c
@@
-872,9
+872,12
@@
rescan:
{
\r
int newlen;
\r
char *p, *newdir;
\r
{
\r
int newlen;
\r
char *p, *newdir;
\r
- if (!(inp & PBTN_MOK)) continue;
\r
+ if (!(inp & PBTN_MOK))
\r
+ continue;
\r
newlen = strlen(curr_path) + strlen(namelist[sel+1]->d_name) + 2;
\r
newdir = malloc(newlen);
\r
newlen = strlen(curr_path) + strlen(namelist[sel+1]->d_name) + 2;
\r
newdir = malloc(newlen);
\r
+ if (newdir == NULL)
\r
+ break;
\r
if (strcmp(namelist[sel+1]->d_name, "..") == 0) {
\r
char *start = curr_path;
\r
p = start + strlen(start) - 1;
\r
if (strcmp(namelist[sel+1]->d_name, "..") == 0) {
\r
char *start = curr_path;
\r
p = start + strlen(start) - 1;
\r
@@
-920,6
+923,13
@@
rescan:
free(namelist);
\r
}
\r
\r
free(namelist);
\r
}
\r
\r
+ // restore curr_path
\r
+ if (fname != NULL) {
\r
+ n = strlen(curr_path);
\r
+ if (curr_path + n + 1 == fname)
\r
+ curr_path[n] = '/';
\r
+ }
\r
+
\r
return ret;
\r
}
\r
\r
return ret;
\r
}
\r
\r