From ffde4db656db589fa63d533243e12b6ffe08ff34 Mon Sep 17 00:00:00 2001
From: Tyler Goodlet <jgbt@protonmail.com>
Date: Tue, 3 Aug 2021 09:42:32 -0400
Subject: [PATCH] Try out cancelling a root cancel scope for guest mode
 teardown

---
 piker/ui/_exec.py | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/piker/ui/_exec.py b/piker/ui/_exec.py
index 284ddd9b..ce14b2e7 100644
--- a/piker/ui/_exec.py
+++ b/piker/ui/_exec.py
@@ -39,7 +39,7 @@ import qdarkstyle
 from qdarkstyle import DarkPalette
 # import qdarkgraystyle
 import trio
-from outcome import Error
+from outcome import Error, Outcome
 
 from .._daemon import maybe_open_pikerd, _tractor_kwargs
 from ..log import get_logger
@@ -73,12 +73,16 @@ if platform.system() == "Windows":
 
 
 def run_qtractor(
+
     func: Callable,
     args: Tuple,
     main_widget: QtGui.QWidget,
+
     tractor_kwargs: Dict[str, Any] = {},
     window_type: QtGui.QMainWindow = None,
-) -> None:
+
+) -> int:
+
     # avoids annoying message when entering debugger from qt loop
     pyqtRemoveInputHook()
 
@@ -119,7 +123,7 @@ def run_qtractor(
         event.fn = fn
         app.postEvent(reenter, event)
 
-    def done_callback(outcome):
+    def done_callback(outcome: Outcome) -> Outcome:
 
         if isinstance(outcome, Error):
             exc = outcome.error
@@ -131,8 +135,11 @@ def run_qtractor(
             else:
                 traceback.print_exception(type(exc), exc, exc.__traceback__)
 
+        # tear down Qt when ``trio`` completes
         app.quit()
 
+        return outcome
+
     # load dark theme
     stylesheet = qdarkstyle.load_stylesheet(
         qt_api='pyqt5',
@@ -164,13 +171,25 @@ def run_qtractor(
     # override tractor's defaults
     tractor_kwargs.update(_tractor_kwargs)
 
+    # setup a root scope to be cancelled on Qt exit
+    root_trio_cs = trio.CancelScope()
+    app.lastWindowClosed.connect(root_trio_cs.cancel)
+
     # define tractor entrypoint
     async def main():
 
-        async with maybe_open_pikerd(
-            **tractor_kwargs,
-        ):
-            await func(*((instance,) + args))
+        nonlocal root_trio_cs
+
+        with root_trio_cs as rcs:
+
+            async with maybe_open_pikerd(
+                **tractor_kwargs,
+            ):
+                return await func(*((instance,) + args))
+
+        if rcs.cancelled_caught:
+            print('Terminated')
+            return
 
     # guest mode entry
     trio.lowlevel.start_guest_run(
@@ -185,4 +204,6 @@ def run_qtractor(
 
     # actually render to screen
     window.show()
-    app.exec_()
+
+    return_code: int = app.exec_()
+    return return_code