Shutdown tray icons last

This commit is contained in:
JonnyWong16 2020-07-03 19:47:11 -07:00
parent 6710e42134
commit f70f814c70
No known key found for this signature in database
GPG key ID: B1F1F9807184697A

View file

@ -2211,11 +2211,6 @@ def shutdown(restart=False, update=False, checkout=False, reset=False):
logger.info("Removing pidfile %s", PIDFILE) logger.info("Removing pidfile %s", PIDFILE)
os.remove(PIDFILE) os.remove(PIDFILE)
if WIN_SYS_TRAY_ICON:
WIN_SYS_TRAY_ICON.shutdown()
elif MAC_SYS_TRAY_ICON:
MAC_SYS_TRAY_ICON.shutdown()
if restart: if restart:
logger.info("Tautulli is restarting...") logger.info("Tautulli is restarting...")
@ -2248,6 +2243,11 @@ def shutdown(restart=False, update=False, checkout=False, reset=False):
logger.shutdown() logger.shutdown()
if WIN_SYS_TRAY_ICON:
WIN_SYS_TRAY_ICON.shutdown()
elif MAC_SYS_TRAY_ICON:
MAC_SYS_TRAY_ICON.shutdown()
os._exit(0) os._exit(0)