void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reapply "Disable system proxy support on Linux"

Browse source 
This reverts commit 202a4064a4.
This commit is contained in:
John Preston 2024-03-16 09:54:07 +04:00
parent 393f330d15
commit 55b2b04e2e
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Telegram/SourceFiles/core/sandbox.cpp
View file

@ -33,6 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtGui/QSessionManager> #include <QtGui/QSessionManager>
#include <QtGui/QScreen> #include <QtGui/QScreen>
#include <QtGui/qpa/qplatformscreen.h> #include <QtGui/qpa/qplatformscreen.h>
#include <ksandbox.h>
namespace Core { namespace Core {
namespace { namespace {
@ -517,8 +518,10 @@ void Sandbox::refreshGlobalProxy() {
|| proxy.type == MTP::ProxyData::Type::Http) { || proxy.type == MTP::ProxyData::Type::Http) {
QNetworkProxy::setApplicationProxy( QNetworkProxy::setApplicationProxy(
MTP::ToNetworkProxy(MTP::ToDirectIpProxy(proxy))); MTP::ToNetworkProxy(MTP::ToDirectIpProxy(proxy)));
} else if (!Core::IsAppLaunched() } else if ((!Core::IsAppLaunched()
|| Core::App().settings().proxy().isSystem()) { || Core::App().settings().proxy().isSystem())
// this works stable only in sandboxed environment where it works through portal
&& (!Platform::IsLinux() || KSandbox::isInside() || cDebugMode())) {
QNetworkProxyFactory::setUseSystemConfiguration(true); QNetworkProxyFactory::setUseSystemConfiguration(true);
} else { } else {
QNetworkProxy::setApplicationProxy(QNetworkProxy::NoProxy); QNetworkProxy::setApplicationProxy(QNetworkProxy::NoProxy);