Ticket #38: saved_path.patch

src/layout.c

@@ -913 +913 @@
         }
     }
 
+    /* Restoring saved path from panels.ini for nonlist panel */
+    /* when it's first creation (for example view_info) */
+    if (!old_widget && type != view_listing) {
+        char panel_dir[MC_MAXPATHLEN];
+        mc_get_current_wd(panel_dir, sizeof(panel_dir));
+        panels[num].last_saved_dir = g_strdup(panel_dir);
+    }
+
     switch (type){
     case view_listing:
         new_widget = restore_into_right_dir_panel(num, old_widget);
@@ -1148 +1156 @@
 
     return new_widget;
 }
+
+/* Return working dir, if it's view_listing - cwd,
+   but for other types - last_saved_dir
+*/
+const char *get_panel_dir_for(WPanel *widget)
+{
+    int i;
+    for (i = 0; i < MAX_VIEWS; i++)
+        if ((WPanel *) get_panel_widget(i) == widget)
+            break;
+
+    if (i < MAX_VIEWS) {
+        if (get_display_type(i) == view_listing)
+            return ((WPanel *) get_panel_widget(i))->cwd;
+        else
+            return panels[i].last_saved_dir;
+    } else
+        return ".";
+}

src/layout.h

@@ -29 +29 @@
 
 void save_panel_dir(int index);
 Widget *restore_into_right_dir_panel(int index, Widget *from_widget);
+const char *get_panel_dir_for(WPanel *widget);
 
 void set_hintbar (const char *str);
 

src/setup.c

@@ -353 +353 @@
         panel_save_setup (right_panel, right_panel->panel_name);
 
     mc_config_set_string(mc_panels_config, "Dirs" , "other_dir",
-                               get_other_type () == view_listing
-                               ? other_panel->cwd : ".");
+                               get_panel_dir_for(other_panel));
     if (current_panel != NULL)
             mc_config_set_string(mc_panels_config, "Dirs" , "current_is_left",
                                        get_current_index () == 0 ? "1" : "0");