mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-22 02:01:08 +07:00
fix: dev rebase errors
This commit is contained in:
@@ -234,10 +234,12 @@ void CoreController::initControllers()
|
||||
Qt::QueuedConnection);
|
||||
connect(m_connectionUiController, &ConnectionUiController::requestSetProcessedServer,
|
||||
this, [this](const QString &serverId) {
|
||||
m_serversUiController->setProcessedServerIndex(m_serversController->indexOfServerId(serverId));
|
||||
m_serversUiController->setProcessedServerId(serverId);
|
||||
}, Qt::QueuedConnection);
|
||||
connect(m_installUiController, &InstallUiController::currentContainerUpdated,
|
||||
m_connectionUiController, &ConnectionUiController::onCurrentContainerUpdated);
|
||||
connect(m_installUiController, &InstallUiController::updateContainerFinished,
|
||||
m_connectionUiController, [this](const QString &, bool) {
|
||||
m_connectionUiController->onCurrentContainerUpdated();
|
||||
});
|
||||
|
||||
m_apiNewsUiController = new ApiNewsUiController(m_newsModel, m_newsController, this);
|
||||
setQmlContextProperty("ApiNewsController", m_apiNewsUiController);
|
||||
|
||||
Reference in New Issue
Block a user