From 7d6aae70c5989499e2f416045516141d4db9dd3c Mon Sep 17 00:00:00 2001
From: Tom Wagner <tom.a.wagner@protonmail.com>
Date: Wed, 27 Sep 2023 10:53:36 +0000
Subject: [PATCH] pipewire connection: restart the outer loop

---
 src/pipewire_connection/mod.rs | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/pipewire_connection/mod.rs b/src/pipewire_connection/mod.rs
index f03b677..4ca9275 100644
--- a/src/pipewire_connection/mod.rs
+++ b/src/pipewire_connection/mod.rs
@@ -67,23 +67,14 @@ pub(super) fn thread_main(
         let core = match context.connect(None) {
             Ok(core) => Rc::new(core),
             Err(_) => {
-                // If connection is failed, try to connect every 200ms
+                // If connection is failed, try to connect again in 200ms
                 let interval = Some(Duration::from_millis(200));
 
-                let core = Rc::new(RefCell::new(None));
-                let timer = mainloop.add_timer(
-                    clone!(@strong mainloop, @strong context, @strong core => move |_| {
-                        if let Ok(x) = context.connect(None) {
-                            core.replace(Some(x));
-                            mainloop.quit();
-                        }
-                    }),
-                );
+                let timer = mainloop.add_timer(clone!(@strong mainloop => move |_| {
+                    mainloop.quit();
+                }));
 
-                timer
-                    .update_timer(interval, interval)
-                    .into_result()
-                    .unwrap();
+                timer.update_timer(interval, None).into_result().unwrap();
 
                 let receiver = pw_receiver.attach(&mainloop, {
                     clone!(@strong mainloop, @strong is_stopped => move |msg|
@@ -98,11 +89,7 @@ pub(super) fn thread_main(
                 mainloop.run();
                 pw_receiver = receiver.deattach();
 
-                if is_stopped.get() {
-                    break;
-                }
-
-                Rc::new(core.take().unwrap())
+                continue;
             }
         };