Mercurial Repositories > eric / file diff

--- a/UI/UserInterface.py	Sun Oct 21 14:22:31 2018 +0200
+++ b/UI/UserInterface.py	Sun Oct 21 18:42:53 2018 +0200
@@ -222,9 +222,14 @@
         self.__startup = True
         
         self.__proxyFactory = E5NetworkProxyFactory()
-        QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory)
-        QNetworkProxyFactory.setUseSystemConfiguration(
-            Preferences.getUI("UseSystemProxy"))
+        if Preferences.getUI("UseSystemProxy"):
+            QNetworkProxyFactory.setApplicationProxyFactory(
+                QNetworkProxyFactory())
+            QNetworkProxyFactory.setUseSystemConfiguration(True)
+        else:
+            QNetworkProxyFactory.setApplicationProxyFactory(
+                self.__proxyFactory)
+            QNetworkProxyFactory.setUseSystemConfiguration(False)
         
         self.capProject = ""
         self.capEditor = ""
@@ -5821,8 +5826,14 @@
             self.bottomSidebar.setDelay(delay)
             self.rightSidebar.setDelay(delay)
         
-        QNetworkProxyFactory.setUseSystemConfiguration(
-            Preferences.getUI("UseSystemProxy"))
+        if Preferences.getUI("UseSystemProxy"):
+            QNetworkProxyFactory.setApplicationProxyFactory(
+                QNetworkProxyFactory())
+            QNetworkProxyFactory.setUseSystemConfiguration(True)
+        else:
+            QNetworkProxyFactory.setApplicationProxyFactory(
+                self.__proxyFactory)
+            QNetworkProxyFactory.setUseSystemConfiguration(False)
         
         from HexEdit.HexEditMainWindow import HexEditMainWindow
         for hexEditor in HexEditMainWindow.windows: