Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2017-01-22 18:32:54 +01:00
22 changed files with 305 additions and 296 deletions

View File

@@ -1852,10 +1852,14 @@ void Preferences::fillPreferences ()
if (Glib::file_test (moptions.gimpDir, Glib::FILE_TEST_IS_DIR)) {
gimpDir->set_current_folder (moptions.gimpDir);
} else {
gimpDir->set_current_folder ("");
}
if (Glib::file_test (moptions.psDir, Glib::FILE_TEST_IS_DIR)) {
psDir->set_current_folder (moptions.psDir);
} else {
psDir->set_current_folder ("");
}
#elif defined __APPLE__