fix fileman bug where trying to open a .desktop file that was a link to a directory would fail

SVN revision: 76288
This commit is contained in:
Mike Blumenkrantz 2012-09-07 08:29:20 +00:00
parent 20efd7c8cd
commit ff9ca76afc
1 changed files with 4 additions and 5 deletions

View File

@ -2099,20 +2099,19 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page,
} }
else else
{ {
snprintf(buf, sizeof(buf), "%s/%s", snprintf(buf, sizeof(buf), "%s/%s", e_fm2_real_path_get(page->fm_obj), ici->file);
e_fm2_real_path_get(page->fm_obj), ici->file);
if (S_ISDIR(ici->statinfo.st_mode)) if (S_ISDIR(ici->statinfo.st_mode))
{ {
if ((!fileman_config->view.open_dirs_in_place) || (fwin->zone)) if ((!fileman_config->view.open_dirs_in_place) || (fwin->zone))
{ {
if (fwin->win) if (fwin->win)
fwin2 = _e_fwin_new(fwin->win->container, NULL, buf); fwin2 = _e_fwin_new(fwin->win->container, NULL, ici->link ?: buf);
else if (fwin->zone) else if (fwin->zone)
fwin2 = _e_fwin_new(fwin->zone->container, NULL, buf); fwin2 = _e_fwin_new(fwin->zone->container, NULL, ici->link ?: buf);
} }
else else
{ {
e_fm2_path_set(page->fm_obj, NULL, buf); e_fm2_path_set(page->fm_obj, NULL, ici->link ?: buf);
_e_fwin_window_title_set(page); _e_fwin_window_title_set(page);
l = NULL; l = NULL;
} }