From 764a482f8c615c9565c0427efcd3628c28f890bc Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Thu, 1 Aug 2024 21:03:34 +0200 Subject: [PATCH] [fix] NetworkMgr: apply HTTP proxy setting on startup (#12260) Fixes #12244. --- frontend/ui/network/manager.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/ui/network/manager.lua b/frontend/ui/network/manager.lua index a9de9b6c7..6f7c81df1 100644 --- a/frontend/ui/network/manager.lua +++ b/frontend/ui/network/manager.lua @@ -1225,8 +1225,9 @@ function NetworkMgr:setWirelessBackend(name, options) require("ui/network/"..name).init(self, options) end --- set network proxy if global variable G_defaults:readSetting("NETWORK_PROXY") is defined -if G_defaults:readSetting("NETWORK_PROXY") then +if G_reader_settings:readSetting("http_proxy_enabled") and G_reader_settings:readSetting("http_proxy") then + NetworkMgr:setHTTPProxy(G_reader_settings:readSetting("http_proxy")) +elseif G_defaults:readSetting("NETWORK_PROXY") then NetworkMgr:setHTTPProxy(G_defaults:readSetting("NETWORK_PROXY")) end