fix(tui): simplify application deregistration logic in Subscriber

the old way could occasionally see an application not get properly deregistered after closing
AnthonyMichaelTDM · Jan 23, 2025 · 91411d7 · 91411d7
1 parent 2611b47
commit 91411d7
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/tui/src/lib.rs b/tui/src/lib.rs
@@ -73,19 +73,17 @@ impl Subscriber {
             .register_application(Context::current(), application_addr.port())
             .await??;
 
-        tokio::spawn(async move {
-            if handler.await == Err(future::Aborted) {
-                let _ = daemon
-                    .clone()
-                    .unregister_application(Context::current(), application_addr.port())
-                    .await;
-            }
-        });
+        tokio::spawn(handler);
 
         let interrupted = interrupt_rx.recv().await;
 
         abort_handle.abort();
 
+        let _ = daemon
+            .clone()
+            .unregister_application(Context::current(), application_addr.port())
+            .await;
+
         Ok(interrupted?)
     }
 }