Fix for restart after update failing and causing UI to become unresponsive.

bazarr/main.py

@@ -177,32 +177,37 @@ def redirect_root():
 
 @route(base_url + 'shutdown')
 def shutdown():
+    try:
+        server.stop()
+    except:
+        logging.error('BAZARR Cannot stop CherryPy.')
+    else:
+        database.close()
         try:
             stop_file = open(os.path.join(args.config_dir, "bazarr.stop"), "w")
         except Exception as e:
             logging.error('BAZARR Cannot create bazarr.stop file.')
         else:
-        server.stop()
-        database.close()
             stop_file.write('')
             stop_file.close()
-        sys.exit(0)
 
 
 @route(base_url + 'restart')
 def restart():
+    try:
+        server.stop()
+    except:
+        logging.error('BAZARR Cannot stop CherryPy.')
+    else:
+        database.close()
         try:
             restart_file = open(os.path.join(args.config_dir, "bazarr.restart"), "w")
         except Exception as e:
             logging.error('BAZARR Cannot create bazarr.restart file.')
         else:
-        # print 'Bazarr is being restarted...'
             logging.info('Bazarr is being restarted...')
-        server.stop()
-        database.close()
             restart_file.write('')
             restart_file.close()
-        sys.exit(0)
 
 
 @route(base_url + 'wizard')