From a13f1217871ab3d7c29ef63e8484eb6179e55f7d Mon Sep 17 00:00:00 2001 From: Jean-Yves Avenard Date: Sat, 20 Jul 2013 23:33:37 +1000 Subject: [PATCH] Set HTTP Proxy in mythtv-setup and mythavtest this prevented those applications to work behind a proxy, and mythtv-setup couldn't retrieve the channel list Fixes #11695 --- mythtv/programs/mythavtest/main.cpp | 2 ++ mythtv/programs/mythtv-setup/main.cpp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/mythtv/programs/mythavtest/main.cpp b/mythtv/programs/mythavtest/main.cpp index bc1ec9ea7e4..2d4087ed33f 100644 --- a/mythtv/programs/mythavtest/main.cpp +++ b/mythtv/programs/mythavtest/main.cpp @@ -23,6 +23,7 @@ using namespace std; #include "dbcheck.h" #include "mythlogging.h" #include "signalhandling.h" +#include "mythmiscutil.h" // libmythui #include "mythuihelper.h" @@ -258,6 +259,7 @@ int main(int argc, char *argv[]) else { TV::InitKeys(); + setHttpProxy(); if (!UpgradeTVDatabaseSchema(false)) { diff --git a/mythtv/programs/mythtv-setup/main.cpp b/mythtv/programs/mythtv-setup/main.cpp index 4208068ff76..aa145952928 100644 --- a/mythtv/programs/mythtv-setup/main.cpp +++ b/mythtv/programs/mythtv-setup/main.cpp @@ -41,6 +41,7 @@ #include "commandlineparser.h" #include "profilegroup.h" #include "signalhandling.h" +#include "mythmiscutil.h" using namespace std; @@ -368,6 +369,8 @@ int main(int argc, char *argv[]) return GENERIC_EXIT_DB_ERROR; } + setHttpProxy(); + if (use_display) { GetMythUI()->LoadQtConfig();