From 2ba7e296d01fff8534ce8538d69f426f174dc5fd Mon Sep 17 00:00:00 2001 From: Hombre Date: Mon, 29 Aug 2016 01:35:19 +0200 Subject: [PATCH] Bugfix: Options::readFromFile should not reset the options values. They are initialy set in the constructor then should only be updated by each call to this method. --- rtgui/options.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/rtgui/options.cc b/rtgui/options.cc index e723361be..ab887edfe 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -734,8 +734,6 @@ int Options::readFromFile (Glib::ustring fname) try { if (keyFile.load_from_file (fname)) { - setDefaults (); - // -------------------------------------------------------------------------------------------------------- if (keyFile.has_group ("General")) { @@ -1781,14 +1779,10 @@ int Options::readFromFile (Glib::ustring fname) if (options.rtSettings.verbose) { printf("Options::readFromFile / Error code %d while reading values from \"%s\":\n%s\n", err.code(), fname.c_str(), err.what().c_str()); } - - setDefaults (); } catch (...) { if (options.rtSettings.verbose) { printf("Options::readFromFile / Unknown exception while trying to load \"%s\"!\n", fname.c_str()); } - - setDefaults (); } return 1;