Mercurial > hg > forks > geeqie
changeset 2218:a2c6d0d0d31c
Merge branch 'ke' into ke-lua
* ke:
Fix directory walking bug
| author | Klaus Ethgen <Klaus@Ethgen.de> |
|---|---|
| date | Fri, 06 Jan 2012 02:25:47 +0100 |
| parents | 5c5799702e9c (current diff) 546923147030 (diff) |
| children | fea4dd5c4359 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/view_dir_list.c Fri Dec 30 13:59:53 2011 +0100 +++ b/src/view_dir_list.c Fri Jan 06 02:25:47 2012 +0100 @@ -297,7 +297,7 @@ gboolean vdlist_set_fd(ViewDir *vd, FileData *dir_fd) { gboolean ret; - gchar *old_path = NULL; + gchar *old_path = NULL; /* Used to store directory for walking up */ if (!dir_fd) return FALSE; if (vd->dir_fd == dir_fd) return TRUE; @@ -309,7 +309,7 @@ base = remove_level_from_path(vd->dir_fd->path); if (strcmp(base, dir_fd->path) == 0) { - old_path = g_strdup(vd->dir_fd->name); + old_path = g_strdup(filename_from_path(vd->dir_fd->path)); } g_free(base); }