Browse Source

qtox.ini shouldn't overwrite our current profile

If we're running on a given profile, reload the qtox.ini, and it has a diffeent value for the current profile, we don't overwrite our current value with whatever qtox.ini says anymore

It would cause current profile confusions when multiple qTox instances where using different instances but sharing the qtox.ini
pull/1535/head
tux3 10 years ago
parent
commit
0baba7abe2
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
  1. 7
      src/misc/settings.cpp

7
src/misc/settings.cpp

@ -215,8 +215,11 @@ void Settings::load() @@ -215,8 +215,11 @@ void Settings::load()
setProxyType(s.value("proxyType", static_cast<int>(ProxyType::ptNone)).toInt());
proxyAddr = s.value("proxyAddr", "").toString();
proxyPort = s.value("proxyPort", 0).toInt();
currentProfile = s.value("currentProfile", "").toString();
currentProfileId = makeProfileId(currentProfile);
if (currentProfile.isEmpty())
{
currentProfile = s.value("currentProfile", "").toString();
currentProfileId = makeProfileId(currentProfile);
}
autoAwayTime = s.value("autoAwayTime", 10).toInt();
checkUpdates = s.value("checkUpdates", false).toBool();
showWindow = s.value("showWindow", true).toBool();

Loading…
Cancel
Save