liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into psgtk3

Browse Source
This commit is contained in:
heckflosse
2017-03-17 01:04:18 +01:00
parent 3db29b2060 6a3baa3335
commit 70f89ccd48
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtgui/batchqueuepanel.cc
View File

@@ -115,6 +115,8 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog)
if (Glib::file_test (options.savePathFolder, Glib::FILE_TEST_IS_DIR)) { if (Glib::file_test (options.savePathFolder, Glib::FILE_TEST_IS_DIR)) {
outdirFolder->set_current_folder (options.savePathFolder); outdirFolder->set_current_folder (options.savePathFolder);
} else {
outdirFolder->set_current_folder (Glib::get_home_dir());
} }
outdirFolderButton = 0; outdirFolderButton = 0;

6
rtgui/preferences.cc
View File

@@ -1895,13 +1895,13 @@ void Preferences::fillPreferences ()
if (Glib::file_test (moptions.gimpDir, Glib::FILE_TEST_IS_DIR)) { if (Glib::file_test (moptions.gimpDir, Glib::FILE_TEST_IS_DIR)) {
gimpDir->set_current_folder (moptions.gimpDir); gimpDir->set_current_folder (moptions.gimpDir);
} else { } else {
gimpDir->set_current_folder (""); gimpDir->set_current_folder (Glib::get_home_dir());
} }
if (Glib::file_test (moptions.psDir, Glib::FILE_TEST_IS_DIR)) { if (Glib::file_test (moptions.psDir, Glib::FILE_TEST_IS_DIR)) {
psDir->set_current_folder (moptions.psDir); psDir->set_current_folder (moptions.psDir);
} else { } else {
psDir->set_current_folder (""); psDir->set_current_folder (Glib::get_home_dir());
} }
#elif defined __APPLE__ #elif defined __APPLE__
@@ -1909,6 +1909,8 @@ void Preferences::fillPreferences ()
if (Glib::file_test (moptions.psDir, Glib::FILE_TEST_IS_DIR)) { if (Glib::file_test (moptions.psDir, Glib::FILE_TEST_IS_DIR)) {
psDir->set_current_folder (moptions.psDir); psDir->set_current_folder (moptions.psDir);
} else {
psDir->set_current_folder (Glib::get_home_dir());
} }
#endif #endif