From 026baaa15e23f8ae2ea946a2678a534d6a7b3a46 Mon Sep 17 00:00:00 2001
From: Gus Grubba <mavlink@grubba.com>
Date: Thu, 4 Jan 2018 23:58:37 -0500
Subject: [PATCH] Attempt at using default proxy settings.

---
 src/QtLocationPlugin/QGCTileCacheWorker.cpp | 3 +++
 src/VideoStreaming/VideoReceiver.cc         | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/QtLocationPlugin/QGCTileCacheWorker.cpp b/src/QtLocationPlugin/QGCTileCacheWorker.cpp
index 6c6709e61..6ec60c717 100644
--- a/src/QtLocationPlugin/QGCTileCacheWorker.cpp
+++ b/src/QtLocationPlugin/QGCTileCacheWorker.cpp
@@ -1071,6 +1071,9 @@ QGCCacheWorker::_lookupReady(QHostInfo info)
     _hostLookupID = 0;
     if(info.error() == QHostInfo::NoError && info.addresses().size()) {
         QTcpSocket socket;
+        QNetworkProxy tempProxy;
+        tempProxy.setType(QNetworkProxy::DefaultProxy);
+        socket.setProxy(tempProxy);
         socket.connectToHost(info.addresses().first(), 80);
         if (socket.waitForConnected(2000)) {
             qCDebug(QGCTileCacheLog) << "Yes Internet Access";
diff --git a/src/VideoStreaming/VideoReceiver.cc b/src/VideoStreaming/VideoReceiver.cc
index d41ce3524..7fcde9f1c 100644
--- a/src/VideoStreaming/VideoReceiver.cc
+++ b/src/VideoStreaming/VideoReceiver.cc
@@ -188,7 +188,9 @@ VideoReceiver::_timeout()
         //   found to be working, only then we actually start the stream.
         QUrl url(_uri);
         _socket = new QTcpSocket;
-        _socket->setProxy(QNetworkProxy::NoProxy);
+        QNetworkProxy tempProxy;
+        tempProxy.setType(QNetworkProxy::DefaultProxy);
+        _socket->setProxy(tempProxy);
         connect(_socket, static_cast<void (QTcpSocket::*)(QAbstractSocket::SocketError)>(&QTcpSocket::error), this, &VideoReceiver::_socketError);
         connect(_socket, &QTcpSocket::connected, this, &VideoReceiver::_connected);
         _socket->connectToHost(url.host(), url.port());
-- 
2.22.0