From d12273926cee9d56da13983452ef2ad7559dc193 Mon Sep 17 00:00:00 2001
From: Halali <moravlvk@gmail.com>
Date: Tue, 1 Jan 2019 21:31:01 +0100
Subject: [PATCH] Fix Merge

---
 bazarr/check_update.py | 6 +++---
 bazarr/main.py         | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bazarr/check_update.py b/bazarr/check_update.py
index 225d8c153..555ad731b 100644
--- a/bazarr/check_update.py
+++ b/bazarr/check_update.py
@@ -6,12 +6,12 @@ import sqlite3
 import json
 import requests
 
-if not no_update:
-    import git
-
 from get_args import args
 from get_settings import get_general_settings
 
+if not args.no_update:
+    import git
+
 current_working_directory = os.path.dirname(os.path.dirname(__file__))
 
 
diff --git a/bazarr/main.py b/bazarr/main.py
index 06aa987d5..4faf4a47c 100644
--- a/bazarr/main.py
+++ b/bazarr/main.py
@@ -13,6 +13,8 @@ import hashlib
 import urllib
 import warnings
 import queueconfig
+import platform
+import apprise
 
 from get_args import args
 from init import *
@@ -1537,7 +1539,7 @@ def system():
     with open(os.path.join(args.config_dir, 'config', 'releases.txt'), 'r') as f:
         releases = ast.literal_eval(f.read())
 
-    import platform
+    use_sonarr = get_general_settings()[12]
     url_sonarr = get_sonarr_settings()[6]
     apikey_sonarr = get_sonarr_settings()[4]
     sv = url_sonarr + "/api/system/status?apikey=" + apikey_sonarr
@@ -1547,7 +1549,8 @@ def system():
             sonarr_version = requests.get(sv, timeout=15, verify=False).json()['version']
         except:
             pass
-
+        
+    use_radarr = get_general_settings()[13]
     url_radarr = get_radarr_settings()[6]
     apikey_radarr = get_radarr_settings()[4]
     rv = url_radarr + "/api/system/status?apikey=" + apikey_radarr