Merge from default branch

This commit is contained in:
ffsup2
2010-09-24 22:49:15 +02:00
parent 18d6799cbe
commit dc2350cee8
145 changed files with 23287 additions and 17316 deletions

View File

@@ -114,7 +114,7 @@ void ProfilePanel::save_clicked () {
Gtk::FileChooserDialog dialog(M("PROFILEPANEL_SAVEDLGLABEL"), Gtk::FILE_CHOOSER_ACTION_SAVE);
if (options.multiUser)
dialog.set_current_folder (Options::cacheBaseDir + "/" + options.profilePath);
dialog.set_current_folder (Options::rtdir + "/" + options.profilePath);
else
dialog.set_current_folder (argv0 + "/" + options.profilePath);
@@ -203,7 +203,7 @@ void ProfilePanel::load_clicked () {
Gtk::FileChooserDialog dialog(M("PROFILEPANEL_LOADDLGLABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN);
if (options.multiUser)
dialog.set_current_folder (Options::cacheBaseDir + "/" + options.profilePath);
dialog.set_current_folder (Options::rtdir + "/" + options.profilePath);
else
dialog.set_current_folder (argv0 + "/" + options.profilePath);