mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Allow disabling even system proxy settings.

Browse Source 
Fixes #4944.
This commit is contained in:
John Preston
2018-11-05 17:58:24 +04:00
parent ef64d9c188
commit e482f041a8
17 changed files with 151 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/mtproto/mtp_instance.cpp
View File

@@ -329,7 +329,8 @@ void Instance::Private::applyDomainIps(
for (auto &proxy : Global::RefProxiesList()) {
applyToProxy(proxy);
}
if (applyToProxy(Global::RefSelectedProxy()) && Global::UseProxy()) {
if (applyToProxy(Global::RefSelectedProxy())
&& (Global::ProxySettings() == ProxyData::Settings::Enabled)) {
for (auto &session : _sessions) {
session.second->refreshOptions();
}
@@ -358,7 +359,8 @@ void Instance::Private::setGoodProxyDomain(
for (auto &proxy : Global::RefProxiesList()) {
applyToProxy(proxy);
}
if (applyToProxy(Global::RefSelectedProxy()) && Global::UseProxy()) {
if (applyToProxy(Global::RefSelectedProxy())
&& (Global::ProxySettings() == ProxyData::Settings::Enabled)) {
Sandbox::refreshGlobalProxy();
}
}