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

Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into feature/v2ray-container

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-04-08 18:14:52 +03:00
commit 44018ec94c
208 changed files with 1816 additions and 1503580 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/ui/pages_logic/protocols/ShadowSocksLogic.cpp
View file

@ -107,8 +107,9 @@ void ShadowSocksLogic::onPushButtonSaveClicked()
progressBarFunc.setTextFunc(QString("Configuring..."));
auto installAction = [this, containerConfig, &newContainerConfig]() {
return m_serverController->updateContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex),
uiLogic()->m_selectedDockerContainer, containerConfig, newContainerConfig);
ServerController serverController(m_settings);
return serverController.updateContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex),
uiLogic()->m_selectedDockerContainer, containerConfig, newContainerConfig);
};
ErrorCode e = uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->doInstallAction(installAction, pageFunc, progressBarFunc,
saveButtonFunc, waitInfoFunc,