merge 'options-save-raise-exception-on-failure' into 'dev'

2017-08-22 16:39:06 +02:00
parent ad20c39907 b39f072baf
commit aa5dcdc3fc
8 changed files with 1034 additions and 950 deletions
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -2103,7 +2103,14 @@ void Preferences::okPressed ()
    workflowUpdate();
    options.copyFrom (&moptions);
    options.filterOutParsedExtensions();
-    Options::save ();
+
+    try {
+        Options::save ();
+    } catch (Options::Error &e) {
+        Gtk::MessageDialog msgd (getToplevelWindow (this), e.get_msg(), true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_CLOSE, true);
+        msgd.run();
+    }
+
    dynProfilePanel->save();
    hide ();
 }