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

Bugfix: Options::readFromFile should not reset the options values. They

Browse Source 
are initialy set in the constructor then should only be updated by each
call to this method.
This commit is contained in:
Hombre 2016-08-29 01:35:19 +02:00
parent d9d539cbb3
commit 2ba7e296d0
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/options.cc
View File

@ -734,8 +734,6 @@ int Options::readFromFile (Glib::ustring fname)
try { try {
if (keyFile.load_from_file (fname)) { if (keyFile.load_from_file (fname)) {
setDefaults ();
// -------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------
if (keyFile.has_group ("General")) { if (keyFile.has_group ("General")) {
@ -1781,14 +1779,10 @@ int Options::readFromFile (Glib::ustring fname)
if (options.rtSettings.verbose) { 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()); 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 (...) { } catch (...) {
if (options.rtSettings.verbose) { if (options.rtSettings.verbose) {
printf("Options::readFromFile / Unknown exception while trying to load \"%s\"!\n", fname.c_str()); printf("Options::readFromFile / Unknown exception while trying to load \"%s\"!\n", fname.c_str());
} }
setDefaults ();
} }
return 1; return 1;