Merge branch 'develop' into ticket/SG-34298-rebranding

shotgunsoftware · Mar 20, 2024 · 3572b56 · 3572b56
2 parents 3254329 + 9f45cb3
commit 3572b56
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/python/tk_framework_alias_utils/plugin_bootstrap.py b/python/tk_framework_alias_utils/plugin_bootstrap.py
@@ -111,6 +111,7 @@ def toolkit_plugin_bootstrap(
 
     # This will block and not return until Flow Production Tracking app exits.
     ret = app.exec_()
+    logger.info("ShotGrid QApplication exited with return code: %s" % ret)
 
     # Clean up Flow Production Tracking components
     root_logger = sgtk.LogManager().root_logger
@@ -120,9 +121,13 @@ def toolkit_plugin_bootstrap(
         if isinstance(handler, ToolkitEngineHandler):
             root_logger.removeHandler(handler)
 
+    # Get the engine again before clean up, our reference may be stale.
+    engine = sgtk.platform.current_engine()
     if engine:
+        logger.info("Destroying Toolkit...")
         engine.destroy()
 
+    logger.info("Plugin bootstrap exiting")
     return ret