From a061dac29879fac970b34339bb82167cffb33e98 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Wed, 4 Nov 2020 22:22:26 +0100 Subject: [PATCH] Check network proxy mode --- src/engine/enginebase.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/engine/enginebase.cpp b/src/engine/enginebase.cpp index 5b21d7921..731c3e760 100644 --- a/src/engine/enginebase.cpp +++ b/src/engine/enginebase.cpp @@ -31,6 +31,7 @@ #include #include "core/timeconstants.h" +#include "core/networkproxyfactory.h" #include "engine_fwd.h" #include "enginebase.h" #include "settings/backendsettingspage.h" @@ -130,7 +131,8 @@ void Engine::Base::ReloadSettings() { s.endGroup(); s.beginGroup(NetworkProxySettingsPage::kSettingsGroup); - if (s.contains("engine") && s.value("engine").toBool()) { + NetworkProxyFactory::Mode proxy_mode = NetworkProxyFactory::Mode(s.value("mode", NetworkProxyFactory::Mode_System).toInt()); + if (proxy_mode == NetworkProxyFactory::Mode_Manual && s.contains("engine") && s.value("engine").toBool()) { QString proxy_host = s.value("hostname").toString(); int proxy_port = s.value("port").toInt(); if (proxy_host.isEmpty() || proxy_port <= 0) {