Skip to content

fix for #1359 #1361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix for #1359 #1361

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46ded41
wait for spirc task to finish
todorangrg Aug 21, 2025
092f65f
awaiting on all shutdowns
todorangrg Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main_loop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ impl MainLoop {
.set_session(shared_spirc.clone(), connection.session)
{
let _ = shared_spirc.shutdown();
let _ = (&mut spirc_task).await;
break 'mainloop Err(err).wrap_err("failed to configure dbus server");
}
}
Expand All @@ -218,11 +219,13 @@ impl MainLoop {
// a new session has been started via the discovery stream
_ = self.credentials_provider.incoming_connection() => {
let _ = shared_spirc.shutdown();
let _ = (&mut spirc_task).await;
break;
}
// the program should shut down
_ = &mut ctrl_c => {
let _ = shared_spirc.shutdown();
let _ = (&mut spirc_task).await;
break 'mainloop Ok(());
}
// spirc was shut down by some external factor
Expand All @@ -234,6 +237,7 @@ impl MainLoop {
#[cfg(feature = "dbus_mpris")]
{
let _ = shared_spirc.shutdown();
let _ = (&mut spirc_task).await;
*dbus_server.as_mut() = Either::Right(future::pending());
break 'mainloop result.wrap_err("DBus terminated unexpectedly");
}
Expand Down