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-03-11 10:06:14 +01:00
parent 424b9dbea7 191a139445
commit 98d3f8de0a
10 changed files with 156 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtgui/main.cc
View File

@@ -629,20 +629,19 @@ int main (int argc, char **argv)
int ret = 0;
Glib::ustring fatalError;
try {
Options::load();
} catch (Options::Error &e) {
std::cout << "ERROR: " << e.get_msg() << std::endl;
std::cerr << "Fatal error!" << std::endl;
std::cerr << "The RT_SETTINGS and/or RT_PATH environment variables are set, but use a relative path. The path must be absolute!" << std::endl;
return -2;
fatalError = e.get_msg();
}
gdk_threads_set_lock_functions (G_CALLBACK (myGdkLockEnter), (G_CALLBACK (myGdkLockLeave)));
gdk_threads_init();
gtk_init (&argc, &argv); // use the "--g-fatal-warnings" command line flag to make warnings fatal
if (remote) {
if (fatalError.empty() && remote) {
char *app_argv[2] = { const_cast<char *> (argv0.c_str()) };
int app_argc = 1;
@@ -654,7 +653,7 @@ int main (int argc, char **argv)
RTApplication app;
ret = app.run (app_argc, app_argv);
} else {
if (init_rt()) {
if (fatalError.empty() && init_rt()) {
Gtk::Main m (&argc, &argv);
gdk_threads_enter();
const std::unique_ptr<RTWindow> rtWindow (create_rt_window());
@@ -680,7 +679,7 @@ int main (int argc, char **argv)
cleanup_rt();
} else {
Gtk::Main m (&argc, &argv);
Gtk::MessageDialog msgd ("Fatal error!\nThe RT_SETTINGS and/or RT_PATH environment variables are set, but use a relative path. The path must be absolute!", true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
Gtk::MessageDialog msgd (Glib::ustring::compose("FATAL ERROR!\n\n%1", fatalError), true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
msgd.run ();
ret = -2;
}