diff options
-rw-r--r-- | Settings.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -838,8 +838,8 @@ Settings* Settings_new(unsigned int initialCpuCount, Hashtable* dynamicMeters, H #endif this->changed = false; this->delay = DEFAULT_DELAY; - bool ok = false; - if (legacyDotfile) { + bool ok = Settings_read(this, this->filename, initialCpuCount); + if (!ok && legacyDotfile) { ok = Settings_read(this, legacyDotfile, initialCpuCount); if (ok) { // Transition to new location and delete old configuration file @@ -850,9 +850,6 @@ Settings* Settings_new(unsigned int initialCpuCount, Hashtable* dynamicMeters, H free(legacyDotfile); } if (!ok) { - ok = Settings_read(this, this->filename, initialCpuCount); - } - if (!ok) { this->screenTabs = true; this->changed = true; ok = Settings_read(this, SYSCONFDIR "/htoprc", initialCpuCount); |