mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +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

5
Telegram/SourceFiles/apiwrap.cpp
View File

@@ -195,11 +195,8 @@ void ApiWrap::refreshProxyPromotion() {
getProxyPromotionDelayed(now, next);
return;
}
const auto proxy = Global::UseProxy()
? Global::SelectedProxy()
: ProxyData();
const auto key = [&]() -> std::pair<QString, uint32> {
if (!Global::UseProxy()) {
if (Global::ProxySettings() != ProxyData::Settings::Enabled) {
return {};
}
const auto &proxy = Global::SelectedProxy();