627,628c627,628
<     if (current_dir != "") {
<         dialog.set_current_folder(current_dir);
---
>     if (current_gig_dir != "") {
>         dialog.set_current_folder(current_gig_dir);
635c635
<         current_dir = Glib::path_get_dirname(filename);
---
>         current_gig_dir = Glib::path_get_dirname(filename);
766c766
<             if (current_dir != "") dialog.set_current_folder(current_dir);
---
>             if (current_gig_dir != "") dialog.set_current_folder(current_gig_dir);
802c802
<             current_dir = Glib::path_get_dirname(filename);
---
>             current_gig_dir = Glib::path_get_dirname(filename);
1417a1418,1420
>     if (current_sample_dir != "") {
>         dialog.set_current_folder(current_sample_dir);
>     }
1418a1422
>         current_sample_dir = dialog.get_current_folder();
1567a1572,1574
>     if (current_sample_dir != "") {
>         dialog.set_current_folder(current_sample_dir);
>     }
1578a1586
>         current_sample_dir = dialog.get_current_folder();