From d9b0412aca7b3af585831838b93521cf5a959207 Mon Sep 17 00:00:00 2001
From: Gabriele Musco <gabmus@disroot.org>
Date: Thu, 15 Jun 2023 21:14:10 +0200
Subject: [PATCH] feat: sync join runners

---
 src/runner.rs | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/runner.rs b/src/runner.rs
index 16baf1c..fbab65a 100644
--- a/src/runner.rs
+++ b/src/runner.rs
@@ -113,6 +113,15 @@ impl Runner {
         self.threads.push(logger_thread!(stderr, stderr_sender));
     }
 
+    fn join_threads(&mut self) {
+        loop {
+            match self.threads.pop() {
+                None => break,
+                Some(thread) => thread.join().expect_dialog("Failed to join reader thread"),
+            }
+        }
+    }
+
     pub fn terminate(&mut self) {
         if self.status() != RunnerStatus::Running {
             return;
@@ -128,15 +137,20 @@ impl Runner {
                 .expect_dialog("Could not convert pid to u32"),
         );
         kill(child_pid, SIGTERM).expect_dialog("Could not send sigterm to process");
-        loop {
-            match self.threads.pop() {
-                None => break,
-                Some(thread) => thread.join().expect_dialog("Failed to join reader thread"),
-            }
-        }
+        self.join_threads();
         proc.wait().expect_dialog("Failed to wait for process");
     }
 
+    pub fn join(&mut self) {
+        let process = self.process.take();
+        if process.is_none() {
+            return;
+        }
+        let mut proc = process.unwrap();
+        proc.wait().expect_dialog("Failed to wait for process");
+        self.join_threads();
+    }
+
     pub fn status(&mut self) -> RunnerStatus {
         match &mut self.process {
             None => RunnerStatus::Stopped,