From 27cf46dde480f6243b7a542b5f540eb3560a870e Mon Sep 17 00:00:00 2001 From: dashie Date: Fri, 15 Dec 2023 16:37:08 +0000 Subject: [PATCH] chore: Bump version of daemon --- Cargo.toml | 2 +- src/components/input/source_box.rs | 2 +- src/components/output/sink_box.rs | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 082ca8a..eb172fb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "reset" -version = "0.1.1" +version = "0.1.2" edition = "2021" description = "A wip universal Linux settings application." repository = "https://github.com/Xetibo/ReSet" diff --git a/src/components/input/source_box.rs b/src/components/input/source_box.rs index c48865c..1c839a3 100644 --- a/src/components/input/source_box.rs +++ b/src/components/input/source_box.rs @@ -418,7 +418,6 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc) -> let mut map = input_box_imp.reset_source_map.write().unwrap(); let mut index = input_box_imp.reset_model_index.write().unwrap(); let model_list = input_box_imp.reset_model_list.write().unwrap(); - model_list.append(&alias); if model_list.string(*index - 1) == Some("Monitor of Dummy Output".into()) { if alias == "Monitor of Dummy Output" { return; @@ -465,6 +464,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc) -> if *index == 1 { model_list.append("Monitor of Dummy Output"); + map.insert(String::from("Monitor of Dummy Output"), (0, String::from("Monitor of Dummy Output"))); } for entry in 0..*index { if model_list.string(entry) == Some(alias.clone().into()) { diff --git a/src/components/output/sink_box.rs b/src/components/output/sink_box.rs index decd4da..c3f11be 100644 --- a/src/components/output/sink_box.rs +++ b/src/components/output/sink_box.rs @@ -393,7 +393,6 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc) -> Co let input_stream_changed_box = sink_box.clone(); let res = conn.add_match(sink_added, move |ir: SinkAdded, _, _| { - println!("sink added {}", ir.sink.alias); let sink_box = sink_added_box.clone(); glib::spawn_future(async move { glib::idle_add_once(move || { @@ -422,15 +421,16 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc) -> Co let mut index = output_box_imp.reset_model_index.write().unwrap(); let model_list = output_box_imp.reset_model_list.write().unwrap(); if model_list.string(*index - 1) == Some("Dummy Output".into()) { - if alias == "Dummy Output" { - return; - } model_list.append(&alias); model_list.remove(*index - 1); - map.insert(alias, (sink_index, name)); + map.insert(alias.clone(), (sink_index, name)); + output_box_imp.reset_sink_dropdown.set_selected(0); } else { model_list.append(&alias); - map.insert(alias, (sink_index, name)); + map.insert(alias.clone(), (sink_index, name)); + if alias == "Dummy Output" { + output_box_imp.reset_sink_dropdown.set_selected(0); + } *index += 1; } });