johrpan/musicus
1
0
Fork 0
mirror of https://github.com/johrpan/musicus.git synced 2025-10-26 19:57:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle screens dropping their sender

Browse source
This commit is contained in:
Elias Projahn 2021-02-03 16:32:07 +01:00
parent 1b6f4ab51e
commit d5a1de05a7
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/navigator/mod.rs
View file

@ -37,7 +37,9 @@ impl<O> NavigationHandle<O> {
pub async fn push<I, R, S: Screen<I, R> + 'static>(&self, input: I) -> Option<R> { pub async fn push<I, R, S: Screen<I, R> + 'static>(&self, input: I) -> Option<R> {
let navigator = self.unwrap_navigator(); let navigator = self.unwrap_navigator();
let receiver = navigator.push::<I, R, S>(input); let receiver = navigator.push::<I, R, S>(input);
receiver.await.expect("The sender to send the result of a screen was dropped.")
// If the sender is dropped, return None.
receiver.await.unwrap_or(None)
} }
/// Go back to the previous screen optionally returning something. /// Go back to the previous screen optionally returning something.
@ -137,7 +139,8 @@ impl Navigator {
self.clear_old_widgets(); self.clear_old_widgets();
} }
receiver.await.expect("The sender to send the result of a screen was dropped.") // We ignore the case, if a sender is dropped.
receiver.await.unwrap_or(None)
} }