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

if the container already exists, then add it to the list of containers in the client

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-02-07 10:39:18 +03:00
parent b2fd94d20e
commit b5778a9cb5
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/ui/pages_logic/ServerContainersLogic.cpp
View file

@ -87,11 +87,11 @@ void ServerContainersLogic::onPushButtonContinueClicked(DockerContainer c, int p
emit uiLogic()->goToPage(Page::ServerConfiguringProgress); emit uiLogic()->goToPage(Page::ServerConfiguringProgress);
qApp->processEvents(); qApp->processEvents();
ErrorCode e = uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->doInstallAction([this, c, &config](){ ErrorCode error = uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->doInstallAction([this, c, &config](){
return m_serverController->setupContainer(m_settings->serverCredentials(uiLogic()->selectedServerIndex), c, config); return m_serverController->setupContainer(m_settings->serverCredentials(uiLogic()->selectedServerIndex), c, config);
}); });
if (!e) { if (error == ErrorCode::NoError || error == ErrorCode::ServerContainerAlreadyInstalledError) {
m_settings->setContainerConfig(uiLogic()->selectedServerIndex, c, config); m_settings->setContainerConfig(uiLogic()->selectedServerIndex, c, config);
if (ContainerProps::containerService(c) == ServiceType::Vpn) { if (ContainerProps::containerService(c) == ServiceType::Vpn) {
m_settings->setDefaultContainer(uiLogic()->selectedServerIndex, c); m_settings->setDefaultContainer(uiLogic()->selectedServerIndex, c);

2
client/ui/uilogic.cpp
View file

@ -337,7 +337,7 @@ void UiLogic::installServer(QMap<DockerContainer, QJsonObject> &containers)
m_serverController->disconnectFromHost(installCredentials); m_serverController->disconnectFromHost(installCredentials);
} }
if (error == ErrorCode::NoError) { if (error == ErrorCode::NoError || error == ErrorCode::ServerContainerAlreadyInstalledError) {
QJsonObject server; QJsonObject server;
server.insert(config_key::hostName, installCredentials.hostName); server.insert(config_key::hostName, installCredentials.hostName);
server.insert(config_key::userName, installCredentials.userName); server.insert(config_key::userName, installCredentials.userName);