Fix GUI Settings Migration

This commit is contained in:
Florian Märkl 2020-12-28 22:53:36 +01:00
commit 12c14fed05
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857

View file

@ -17,8 +17,10 @@ static void MigrateSettingsTo2(QSettings *settings)
QMap<QString, QVariant> host; QMap<QString, QVariant> host;
for(QString k : settings->allKeys()) for(QString k : settings->allKeys())
host[k] = settings->value(k); host[k] = settings->value(k);
hosts.append(host);
} }
settings->endArray(); settings->endArray();
settings->remove("registered_hosts");
settings->beginWriteArray("registered_hosts"); settings->beginWriteArray("registered_hosts");
int i=0; int i=0;
for(const auto &host : hosts) for(const auto &host : hosts)
@ -53,12 +55,13 @@ static void MigrateSettings(QSettings *settings)
CHIAKI_LOGE(NULL, "Settings version %d is higher than application one (%d)", version_prev, SETTINGS_VERSION); CHIAKI_LOGE(NULL, "Settings version %d is higher than application one (%d)", version_prev, SETTINGS_VERSION);
return; return;
} }
while(version_prev < 1) while(version_prev < SETTINGS_VERSION)
{ {
version_prev++; version_prev++;
switch(version_prev) switch(version_prev)
{ {
case 2: case 2:
CHIAKI_LOGI(NULL, "Migrating settings to 2");
MigrateSettingsTo2(settings); MigrateSettingsTo2(settings);
break; break;
default: default: