Ticket #3699: patch01-setup.ch-main.c-midnight.c-auto-save-restore-panel.161007.diff

src/setup.h

@@ -119 +119 @@
 
 /* Value of "other_dir" key in ini file */
 extern char *saved_other_dir;
+extern char *saved_this_dir;
 
 /* If set, then print to the given file the last directory we were at */
 extern char *last_wd_string;

src/setup.c

@@ -194 +194 @@
 
 /* Value of "other_dir" key in ini file */
 char *saved_other_dir = NULL;
+char *saved_this_dir = NULL;
 
 /* If set, then print to the given file the last directory we were at */
 char *last_wd_string = NULL;
@@ -930 +931 @@
         panel_save_setup (right_panel, right_panel->panel_name);
 
     {
-        char *dirs;
 
-        dirs = get_panel_dir_for (other_panel);
-        mc_config_set_string (mc_global.panels_config, "Dirs", "other_dir", dirs);
-        g_free (dirs);
+        WPanel *this_panel = PANEL(get_panel_widget(get_current_index()));
+        char *this_dir;
+        char *other_dir;
+        
+        this_dir = get_panel_dir_for(this_panel);
+        mc_config_set_string (mc_global.panels_config, "Dirs", "this_dir", this_dir);
+        g_free (this_dir);
+        
+        other_dir = get_panel_dir_for (other_panel);
+        mc_config_set_string (mc_global.panels_config, "Dirs", "other_dir", other_dir);
+        g_free (other_dir);
     }
 
     if (current_panel != NULL)

src/main.c

@@ -282 +282 @@
     /* Must be done after load_setup because depends on mc_global.vfs.cd_symlinks */
     vfs_setup_work_dir ();
 
-    /* Resolve the other_dir panel option. Must be done after vfs_setup_work_dir */
+    /* Resolve this_dir/other_dir panel options. Must be done after vfs_setup_work_dir */
     {
         char *buffer;
         vfs_path_t *vpath;
 
+        buffer = mc_config_get_string (mc_global.panels_config, "Dirs", "this_dir", ".");
+        vpath = vfs_path_from_str (buffer);
+        if (vfs_file_is_local (vpath))
+            saved_this_dir = buffer;
+        else
+            g_free (buffer);
+        vfs_path_free (vpath);
+
         buffer = mc_config_get_string (mc_global.panels_config, "Dirs", "other_dir", ".");
         vpath = vfs_path_from_str (buffer);
         if (vfs_file_is_local (vpath))
@@ -305 +313 @@
     {
         vfs_shut ();
         done_setup ();
+        g_free (saved_this_dir);
         g_free (saved_other_dir);
         mc_event_deinit (NULL);
         goto startup_exit_falure;
@@ -481 +490 @@
         g_list_free_full ((GList *) mc_run_param0, (GDestroyNotify) mcedit_arg_free);
 
     g_free (mc_run_param1);
+    g_free (saved_this_dir);
     g_free (saved_other_dir);
 
     mc_config_deinit_config_paths ();

src/filemanager/midnight.c

@@ -598 +598 @@
         current_mode = startup_left_mode;
         other_mode = startup_right_mode;
 
         if (mc_run_param0 == NULL && mc_run_param1 == NULL)
         {
             /* no arguments */
-            current_dir = NULL; /* assume current dir */
+            if (panels_options.auto_save_setup) { /* check if we should restore active panel */
+                current_dir = saved_this_dir;
+            } else {
+                current_dir = NULL; /* assume current dir */
+            }
             other_dir = saved_other_dir;        /* from ini */
         }
         else if (mc_run_param0 != NULL && mc_run_param1 != NULL)
@@ -628 +633 @@
         if (mc_run_param0 == NULL && mc_run_param1 == NULL)
         {
             /* no arguments */
-            current_dir = NULL; /* assume current dir */
+            if (panels_options.auto_save_setup) { /* check if we should restore active panel */
+                current_dir = saved_this_dir;
+            } else {
+                current_dir = NULL; /* assume current dir */
+            }
             other_dir = saved_other_dir;        /* from ini */
         }
         else if (mc_run_param0 != NULL && mc_run_param1 != NULL)