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

merge with dev

Browse Source
This commit is contained in:
Desmis
2018-05-05 11:32:47 +02:00
parent 1271701114 eab7483431
commit 238191e546
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
rtgui/main.cc
View File

@@ -468,6 +468,12 @@ int main (int argc, char **argv)
Glib::init(); // called by Gtk::Main, but this may be important for thread handling, so we call it ourselves now Glib::init(); // called by Gtk::Main, but this may be important for thread handling, so we call it ourselves now
Gio::init (); Gio::init ();
#ifdef WIN32
if (GetFileType (GetStdHandle (STD_OUTPUT_HANDLE)) == 0x0003) {
// started from msys2 console => do not buffer stdout
setbuf(stdout, NULL);
}
#endif
#ifdef BUILD_BUNDLE #ifdef BUILD_BUNDLE
char exname[512] = {0}; char exname[512] = {0};
@@ -514,15 +520,6 @@ int main (int argc, char **argv)
options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH; options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
#endif #endif
Glib::ustring fatalError;
try {
Options::load();
} catch (Options::Error &e) {
fatalError = e.get_msg();
}
#ifdef WIN32 #ifdef WIN32
bool consoleOpened = false; bool consoleOpened = false;
@@ -600,6 +597,14 @@ int main (int argc, char **argv)
#endif #endif
Glib::ustring fatalError;
try {
Options::load();
} catch (Options::Error &e) {
fatalError = e.get_msg();
}
if (gimpPlugin) { if (gimpPlugin) {
if (!Glib::file_test (argv1, Glib::FILE_TEST_EXISTS) || Glib::file_test (argv1, Glib::FILE_TEST_IS_DIR)) { if (!Glib::file_test (argv1, Glib::FILE_TEST_EXISTS) || Glib::file_test (argv1, Glib::FILE_TEST_IS_DIR)) {
printf ("Error: argv1 doesn't exist\n"); printf ("Error: argv1 doesn't exist\n");