aboutsummaryrefslogtreecommitdiff
path: root/frontend/common
diff options
context:
space:
mode:
authornotaz2011-01-18 18:04:58 +0200
committernotaz2011-01-24 00:38:35 +0200
commit1bd9ee68b03333894512373d14707d04951665af (patch)
tree9d861222387184b87fe90b62eaa56efce99d5347 /frontend/common
parent5088bb7009b7517276478226dd9df66229f871bc (diff)
downloadpcsx_rearmed-1bd9ee68b03333894512373d14707d04951665af.tar.gz
pcsx_rearmed-1bd9ee68b03333894512373d14707d04951665af.tar.bz2
pcsx_rearmed-1bd9ee68b03333894512373d14707d04951665af.zip
some frontend adjustments
Diffstat (limited to 'frontend/common')
-rw-r--r--frontend/common/menu.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/frontend/common/menu.c b/frontend/common/menu.c
index 22a66ea..aa76e43 100644
--- a/frontend/common/menu.c
+++ b/frontend/common/menu.c
@@ -872,9 +872,12 @@ rescan:
{
int newlen;
char *p, *newdir;
- if (!(inp & PBTN_MOK)) continue;
+ if (!(inp & PBTN_MOK))
+ continue;
newlen = strlen(curr_path) + strlen(namelist[sel+1]->d_name) + 2;
newdir = malloc(newlen);
+ if (newdir == NULL)
+ break;
if (strcmp(namelist[sel+1]->d_name, "..") == 0) {
char *start = curr_path;
p = start + strlen(start) - 1;
@@ -920,6 +923,13 @@ rescan:
free(namelist);
}
+ // restore curr_path
+ if (fname != NULL) {
+ n = strlen(curr_path);
+ if (curr_path + n + 1 == fname)
+ curr_path[n] = '/';
+ }
+
return ret;
}