ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #638: Fix current index in main menu after a setup is aborted

Browse Source
This commit is contained in:
Jenkins nymea 2021-08-11 21:44:26 +02:00
commit c2235df414
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nymea-app/configuredhostsmodel.cpp
View File

@ -17,8 +17,8 @@ ConfiguredHostsModel::ConfiguredHostsModel(QObject *parent) : QAbstractListModel
host->setName(cachedName); host->setName(cachedName);
addHost(host); addHost(host);
settings.endGroup(); settings.endGroup();
m_currentIndex = settings.value("currentIndex", 0).toInt();
} }
m_currentIndex = settings.value("currentIndex", 0).toInt();
settings.endGroup(); settings.endGroup();
// If there aren't any in the config, try migrating settings from old tab model // If there aren't any in the config, try migrating settings from old tab model
@ -42,6 +42,11 @@ ConfiguredHostsModel::ConfiguredHostsModel(QObject *parent) : QAbstractListModel
if (m_list.isEmpty()) { if (m_list.isEmpty()) {
createHost(); createHost();
} }
// Make sure the currentIndex from the config isn't out of place
if (m_currentIndex >= m_list.count()) {
m_currentIndex = m_list.count()-1;
}
} }
int ConfiguredHostsModel::rowCount(const QModelIndex &parent) const int ConfiguredHostsModel::rowCount(const QModelIndex &parent) const