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

Close source selector

Browse source
This commit is contained in:
Elias Projahn 2021-04-15 18:28:21 +02:00
parent d410be75dc
commit 30584cdf2f
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
musicus/src/import/source_selector.rs
View file

@ -1,5 +1,4 @@
use super::import_screen::ImportScreen; use super::import_screen::ImportScreen;
use super::medium_editor::MediumEditor;
use crate::navigator::{NavigationHandle, Screen}; use crate::navigator::{NavigationHandle, Screen};
use crate::widgets::Widget; use crate::widgets::Widget;
use gettextrs::gettext; use gettextrs::gettext;
@ -66,10 +65,8 @@ impl Screen<(), ()> for SourceSelector {
spawn!(@clone this, async move { spawn!(@clone this, async move {
match ImportSession::folder(PathBuf::from(path)).await { match ImportSession::folder(PathBuf::from(path)).await {
Ok(session) => { Ok(session) => {
// push!(this.handle, MediumEditor, session).await; let result = push!(this.handle, ImportScreen, session).await;
// this.handle.pop(Some(())); this.handle.pop(result);
push!(this.handle, ImportScreen, session).await;
} }
Err(err) => { Err(err) => {
this.status_page.set_description(Some(&err.to_string())); this.status_page.set_description(Some(&err.to_string()));
@ -91,8 +88,8 @@ impl Screen<(), ()> for SourceSelector {
spawn!(@clone this, async move { spawn!(@clone this, async move {
match ImportSession::audio_cd().await { match ImportSession::audio_cd().await {
Ok(session) => { Ok(session) => {
push!(this.handle, MediumEditor, session).await; let result = push!(this.handle, ImportScreen, session).await;
this.handle.pop(Some(())); this.handle.pop(result);
} }
Err(err) => { Err(err) => {
this.status_page.set_description(Some(&err.to_string())); this.status_page.set_description(Some(&err.to_string()));