mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2762_second_arg'

Browse Source 
* 2762_second_arg:
  Optimization of second panel directory setup.
  Ticket #2762: mc ignores second directory argument.
This commit is contained in:
Andrew Borodin 2012-03-24 17:20:42 +03:00
commit 57369532d3
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/filemanager/midnight.c
View File

@ -570,7 +570,7 @@ create_panels (void)
int current_index;
int other_index;
panel_view_mode_t current_mode, other_mode;
char *original_dir = NULL;
vfs_path_t *original_dir = NULL;
if (boot_current_is_left)
{
@ -597,7 +597,7 @@ create_panels (void)
* since we may not be able to chdir to the proper
* second directory later
*/
original_dir = vfs_get_current_dir ();
original_dir = vfs_path_clone (vfs_get_raw_current_dir ());
}
vpath = vfs_path_from_str (mc_run_param0);
mc_chdir (vpath);
@ -608,14 +608,17 @@ create_panels (void)
/* The other panel */
if (mc_run_param1 != NULL)
{
const char *cd_dir = (original_dir != NULL) ? original_dir : mc_run_param1;
vfs_path_t *vpath;
vpath = vfs_path_from_str (cd_dir);
if (original_dir != NULL)
mc_chdir (original_dir);
vpath = vfs_path_from_str (mc_run_param1);
mc_chdir (vpath);
vfs_path_free (vpath);
}
g_free (original_dir);
vfs_path_free (original_dir);
set_display_type (other_index, other_mode);
if (startup_left_mode == view_listing)