AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #529 from amnezia-vpn/bugfix/container-selection-after-cleanup-server

Browse source 
fixed first container selection on HomeContainersListView after server cleanup
This commit is contained in:
pokamest 2024-01-28 02:56:16 -08:00 • committed by GitHub
commit 00b2b1abcd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/ui/models/servers_model.cpp
View file

@ -251,10 +251,9 @@ void ServersModel::addServer(const QJsonObject &server)
void ServersModel::editServer(const QJsonObject &server)
{
beginResetModel();
m_settings->editServer(m_currentlyProcessedServerIndex, server);
m_servers = m_settings->serversArray();
endResetModel();
m_servers.replace(m_currentlyProcessedServerIndex, m_settings->serversArray().at(m_currentlyProcessedServerIndex));
emit dataChanged(index(m_currentlyProcessedServerIndex, 0), index(m_currentlyProcessedServerIndex, 0));
updateContainersModel();
}

7
client/ui/qml/Components/HomeContainersListView.qml
View file

@ -30,7 +30,9 @@ ListView {
target: ServersModel
function onCurrentlyProcessedServerIndexChanged() {
menuContent.checkCurrentItem()
if (ContainersModel.getDefaultContainer()) {
menuContent.checkCurrentItem()
}
}
}
@ -76,9 +78,8 @@ ListView {
}
if (checked) {
ServersModel.setDefaultContainer(proxyContainersModel.mapToSource(index))
containersDropDown.menuVisible = false
ServersModel.setDefaultContainer(proxyContainersModel.mapToSource(index))
} else {
if (!isSupported && isInstalled) {
PageController.showErrorMessage(qsTr("The selected protocol is not supported on the current platform"))