diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp index 2e3b7866..fe360818 100644 --- a/client/amnezia_application.cpp +++ b/client/amnezia_application.cpp @@ -361,7 +361,7 @@ void AmneziaApplication::initControllers() m_settings, m_configurator)); m_engine->rootContext()->setContextProperty("ExportController", m_exportController.get()); - m_settingsController.reset(new SettingsController(m_serversModel, m_containersModel, m_languageModel, m_settings)); + m_settingsController.reset(new SettingsController(m_serversModel, m_containersModel, m_languageModel, m_sitesModel, m_settings)); m_engine->rootContext()->setContextProperty("SettingsController", m_settingsController.get()); if (m_settingsController->isAutoConnectEnabled() && m_serversModel->getDefaultServerIndex() >= 0) { QTimer::singleShot(1000, this, [this]() { m_connectionController->openConnection(); }); diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp index 9fa4d76b..73b9d276 100644 --- a/client/ui/controllers/settingsController.cpp +++ b/client/ui/controllers/settingsController.cpp @@ -15,11 +15,13 @@ SettingsController::SettingsController(const QSharedPointer &serversModel, const QSharedPointer &containersModel, const QSharedPointer &languageModel, + const QSharedPointer &sitesModel, const std::shared_ptr &settings, QObject *parent) : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel), m_languageModel(languageModel), + m_sitesModel(sitesModel), m_settings(settings) { m_appVersion = QString("%1: %2 (%3)").arg(tr("Software version"), QString(APP_VERSION), __DATE__); @@ -134,6 +136,7 @@ void SettingsController::clearSettings() m_serversModel->resetModel(); m_languageModel->changeLanguage( static_cast(m_languageModel->getCurrentLanguageIndex())); + m_sitesModel->setRouteMode(Settings::RouteMode::VpnAllSites); emit changeSettingsFinished(tr("All settings have been reset to default values")); } diff --git a/client/ui/controllers/settingsController.h b/client/ui/controllers/settingsController.h index 710d255f..a6cbc587 100644 --- a/client/ui/controllers/settingsController.h +++ b/client/ui/controllers/settingsController.h @@ -6,6 +6,7 @@ #include "ui/models/containers_model.h" #include "ui/models/languageModel.h" #include "ui/models/servers_model.h" +#include "ui/models/sites_model.h" class SettingsController : public QObject { @@ -14,6 +15,7 @@ public: explicit SettingsController(const QSharedPointer &serversModel, const QSharedPointer &containersModel, const QSharedPointer &languageModel, + const QSharedPointer &sitesModel, const std::shared_ptr &settings, QObject *parent = nullptr); Q_PROPERTY(QString primaryDns READ getPrimaryDns WRITE setPrimaryDns NOTIFY primaryDnsChanged) @@ -76,6 +78,7 @@ private: QSharedPointer m_serversModel; QSharedPointer m_containersModel; QSharedPointer m_languageModel; + QSharedPointer m_sitesModel; std::shared_ptr m_settings; QString m_appVersion;