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

crash catch + report added for Windows version

Browse Source
This commit is contained in:
John Preston
2016-01-30 19:31:10 +03:00
parent 62c28cb58b
commit 8eef239b45
26 changed files with 4057 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Telegram/SourceFiles/app.cpp
View File

@@ -2610,9 +2610,14 @@ namespace App {
}
QNetworkProxy getHttpProxySettings() {
if (cConnectionType() == dbictHttpProxy) {
const ConnectionProxy &p(cConnectionProxy());
return QNetworkProxy(QNetworkProxy::HttpProxy, p.host, p.port, p.user, p.password);
const ConnectionProxy *proxy = 0;
if (Sandbox::started()) {
proxy = (cConnectionType() == dbictHttpProxy) ? (&cConnectionProxy()) : 0;
} else {
proxy = Global::PreLaunchProxy().host.isEmpty() ? 0 : (&Global::PreLaunchProxy());
}
if (proxy) {
return QNetworkProxy(QNetworkProxy::HttpProxy, proxy->host, proxy->port, proxy->user, proxy->password);
}
return QNetworkProxy(QNetworkProxy::DefaultProxy);
}