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.
This commit is contained in:
Hombre 2016-08-29 01:35:19 +02:00
parent d9d539cbb3
commit 2ba7e296d0

View File

@ -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;