Merge remote-tracking branch 'origin/dev'

This commit is contained in:
echel0n 2014-06-25 21:50:31 -07:00
commit 637d465675

View file

@ -3336,7 +3336,6 @@ class Home(MainHandler):
updated = sickbeard.versionCheckScheduler.action.update() # @UndefinedVariable updated = sickbeard.versionCheckScheduler.action.update() # @UndefinedVariable
if updated: if updated:
# do a hard restart # do a hard restart
if not sickbeard.AUTO_UPDATE:
threading.Timer(2, sickbeard.invoke_restart, [False]).start() threading.Timer(2, sickbeard.invoke_restart, [False]).start()
t = PageTemplate(file="restart_bare.tmpl") t = PageTemplate(file="restart_bare.tmpl")