mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-08 20:41:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2590_chdir_other_panel_on_symlink'

Browse Source 
* 2590_chdir_other_panel_on_symlink:
  Ticket #2590: M-o works unexpectedly on symlink shortcuts
This commit is contained in:
Andrew Borodin 2011-08-12 14:02:59 +04:00
commit c819eb1fa3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/filemanager/panel.c
View File

@ -2339,6 +2339,8 @@ do_enter (WPanel * panel)
static void
chdir_other_panel (WPanel * panel)
{
const file_entry *entry = &panel->dir.list[panel->selected];
char *new_dir;
char *sel_entry = NULL;
@ -2347,13 +2349,13 @@ chdir_other_panel (WPanel * panel)
set_display_type (get_other_index (), view_listing);
}
if (!S_ISDIR (panel->dir.list[panel->selected].st.st_mode))
if (S_ISDIR (entry->st.st_mode) || entry->f.link_to_dir)
new_dir = mc_build_filename (panel->cwd, entry->fname, (char *) NULL);
else
{
new_dir = concat_dir_and_file (panel->cwd, "..");
new_dir = mc_build_filename (panel->cwd, "..", (char *) NULL);
sel_entry = strrchr (panel->cwd, PATH_SEP);
}
else
new_dir = concat_dir_and_file (panel->cwd, panel->dir.list[panel->selected].fname);
change_panel ();
do_cd (new_dir, cd_exact);