diff --git a/gui/slick/interfaces/default/config_general.tmpl b/gui/slick/interfaces/default/config_general.tmpl index 919e91e8..afd01d09 100644 --- a/gui/slick/interfaces/default/config_general.tmpl +++ b/gui/slick/interfaces/default/config_general.tmpl @@ -281,7 +281,7 @@ diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index 79ff342c..ae6c4d1f 100644 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -488,7 +488,7 @@ def initialize(consoleLogging=True): METADATA_WDTV, METADATA_TIVO, IGNORE_WORDS, CALENDAR_UNPROTECTED, CREATE_MISSING_SHOW_DIRS, \ ADD_SHOWS_WO_DIR, USE_SUBTITLES, SUBTITLES_LANGUAGES, SUBTITLES_DIR, SUBTITLES_SERVICES_LIST, SUBTITLES_SERVICES_ENABLED, SUBTITLES_HISTORY, SUBTITLES_FINDER_FREQUENCY, subtitlesFinderScheduler, \ USE_FAILED_DOWNLOADS, DELETE_FAILED, ANON_REDIRECT, LOCALHOST_IP, TMDB_API_KEY, \ - PROXY_SETTING + PROXY_SETTING if __INITIALIZED__: return False @@ -542,7 +542,7 @@ def initialize(consoleLogging=True): LOCALHOST_IP = check_setting_str(CFG, 'General', 'localhost_ip', '') ANON_REDIRECT = check_setting_str(CFG, 'General', 'anon_redirect', 'http://dereferer.org/?') - PROXY_SETTING = check_setting_str(CFG, 'General', 'proxy_setting', 'http://192.168.1.11:8118') + PROXY_SETTING = check_setting_str(CFG, 'General', 'proxy_setting', '') # attempt to help prevent users from breaking links by using a bad url if not ANON_REDIRECT.endswith('?'): ANON_REDIRECT = ''