Small service adjustment

resources/lib/database/__init__.py

@@ -14,6 +14,7 @@ import xbmcvfs
 import emby_db
 from helper.utils import delete_folder
 from helper import _, settings, window, dialog
+from objects import obj
 
 #################################################################################################
 
@@ -21,15 +22,6 @@ LOG = logging.getLogger("EMBY."+__name__)
 
 #################################################################################################
 
-try:
-    from objects import obj
-except Exception as error:
-    # clear patch
-    LOG.exception(error)
-    delete_folder()
-    dialog("ok", heading="{emby}", line1=_(33155))
-    xbmc.executebuiltin('RestartApp')
-
 
 class Database(object):
 

service.py

@@ -55,17 +55,13 @@ if __name__ == "__main__":
                     raise Exception("Aborted during startup delay")
 
                 session.service()
-
-                break
             except Exception as error: # TODO, build exceptions
 
                 LOG.exception(error)
                 session.shutdown()
 
-                if 'RestartService' not in error:
-                    LOG.warn("--<<[ service ]")
-                    
-                    break
+                if 'RestartService' in error:
+                    continue
 
         except Exception as error:
             ''' Issue initializing the service.
@@ -74,4 +70,6 @@ if __name__ == "__main__":
 
             break
 
+        break
+
     LOG.warn("--<[ service ]")