From d5863943c08ec8df69df463da2a61a26d282f6e1 Mon Sep 17 00:00:00 2001
From: JackDandy <JackDandy@users.noreply.github.com>
Date: Tue, 28 Oct 2014 04:27:25 +0000
Subject: [PATCH] Fix theme identification for spinner when restarting.

---
 gui/slick/interfaces/default/restart_bare.tmpl | 15 +++------------
 sickbeard/webserve.py                          |  1 +
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/gui/slick/interfaces/default/restart_bare.tmpl b/gui/slick/interfaces/default/restart_bare.tmpl
index ea345f89..709d5835 100644
--- a/gui/slick/interfaces/default/restart_bare.tmpl
+++ b/gui/slick/interfaces/default/restart_bare.tmpl
@@ -5,11 +5,13 @@
     #set curSBHttpPort = $sbHttpPort
     #set curSBHttpsEnabled = $sbHttpsEnabled
     #set curSBHandleReverseProxy = $sbHandleReverseProxy
+    #set themeSpinner = $sbThemeName
 #except NameMapper.NotFound:
     #set curSBHost = "localhost"
     #set curSBHttpPort = $sickbeard.WEB_PORT
     #set curSBHttpsEnabled = "False"
     #set curSBHandleReverseProxy = "False"
+    #set themeSpinner = $sickbeard.THEME_NAME
 #end try
 sbRoot = "$sbRoot";
 sbHttpPort = "$curSBHttpPort";
@@ -22,18 +24,7 @@ sbHost = "$curSBHost";
 <script type="text/javascript" src="$sbRoot/js/lib/jquery-1.8.3.min.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/restart.js?$sbPID"></script>
 
-#try:
-    #sickbeard
-#except NameError:
-    #set themeSpinner = '';
-#else:
-#if 'dark' != sickbeard.THEME_NAME:
-#set themeSpinner = ''
-#else:
-#set themeSpinner = '-dark'
-#end if
-#end try
-
+#set themeSpinner = '-dark' if 'dark' == themeSpinner else ''
 <h2>Performing Restart</h2>
 <br />
 <div id="shut_down_message">
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index eec0d2f9..b93b90b3 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -513,6 +513,7 @@ class PageTemplate(Template):
         self.sbHttpsPort = sickbeard.WEB_PORT
         self.sbHttpsEnabled = sickbeard.ENABLE_HTTPS
         self.sbHandleReverseProxy = sickbeard.HANDLE_REVERSE_PROXY
+        self.sbThemeName = sickbeard.THEME_NAME
 
         if headers['Host'][0] == '[':
             self.sbHost = re.match("^\[.*\]", headers['Host'], re.X | re.M | re.S).group(0)