andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-22 02:01:08 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

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
parent 6b80a56f92 0160b0f9dc
commit 00b2b1abcd
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ui/models/servers_model.cpp
+2 -3
View File
@@ -251,10 +251,9 @@ void ServersModel::addServer(const QJsonObject &server)
void ServersModel::editServer(const QJsonObject &server) void ServersModel::editServer(const QJsonObject &server)
{ {
beginResetModel();
m_settings->editServer(m_currentlyProcessedServerIndex, server); m_settings->editServer(m_currentlyProcessedServerIndex, server);
m_servers = m_settings->serversArray(); m_servers.replace(m_currentlyProcessedServerIndex, m_settings->serversArray().at(m_currentlyProcessedServerIndex));
endResetModel(); emit dataChanged(index(m_currentlyProcessedServerIndex, 0), index(m_currentlyProcessedServerIndex, 0));
updateContainersModel(); updateContainersModel();
} }
client/ui/qml/Components/HomeContainersListView.qml
+3 -2
View File
@@ -30,9 +30,11 @@ ListView {
target: ServersModel target: ServersModel
function onCurrentlyProcessedServerIndexChanged() { function onCurrentlyProcessedServerIndexChanged() {
if (ContainersModel.getDefaultContainer()) {
menuContent.checkCurrentItem() menuContent.checkCurrentItem()
} }
} }
}
function checkCurrentItem() { function checkCurrentItem() {
var item = menuContent.itemAtIndex(currentIndex) var item = menuContent.itemAtIndex(currentIndex)
@@ -76,9 +78,8 @@ ListView {
} }
if (checked) { if (checked) {
ServersModel.setDefaultContainer(proxyContainersModel.mapToSource(index))
containersDropDown.menuVisible = false containersDropDown.menuVisible = false
ServersModel.setDefaultContainer(proxyContainersModel.mapToSource(index))
} else { } else {
if (!isSupported && isInstalled) { if (!isSupported && isInstalled) {
PageController.showErrorMessage(qsTr("The selected protocol is not supported on the current platform")) PageController.showErrorMessage(qsTr("The selected protocol is not supported on the current platform"))