From 67f3457e3ac0e27e229dcb2b01957204a1e91bf5 Mon Sep 17 00:00:00 2001 From: Fabio Lenherr / DashieTM Date: Thu, 16 Nov 2023 23:21:52 +0100 Subject: [PATCH] fix: Use proper index for sink and sources --- src/components/input/sourceBox.rs | 6 +++--- src/components/output/sinkBox.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/input/sourceBox.rs b/src/components/input/sourceBox.rs index 87fc214..2bf3353 100644 --- a/src/components/input/sourceBox.rs +++ b/src/components/input/sourceBox.rs @@ -302,7 +302,7 @@ pub fn start_input_box_listener( let output_box = source_box.clone(); let output_box_imp = output_box.imp(); let mut list = output_box_imp.resetSourceList.write().unwrap(); - let index = ir.source.index; + let source_index = ir.source.index; let alias = ir.source.alias.clone(); let name = ir.source.name.clone(); let mut is_default = false; @@ -317,11 +317,11 @@ pub fn start_input_box_listener( let source_clone = source_entry.clone(); let entry = Arc::new(ListEntry::new(&*source_entry)); entry.set_activatable(false); - list.insert(index, (entry.clone(), source_clone, alias.clone())); + list.insert(source_index, (entry.clone(), source_clone, alias.clone())); output_box_imp.resetSources.append(&*entry); let mut map = output_box_imp.resetSourceMap.write().unwrap(); let mut index = output_box_imp.resetModelIndex.write().unwrap(); - map.insert(alias, (*index, *index, name)); + map.insert(alias, (source_index, *index, name)); *index += 1; }); }); diff --git a/src/components/output/sinkBox.rs b/src/components/output/sinkBox.rs index 9430ee5..88c9a81 100644 --- a/src/components/output/sinkBox.rs +++ b/src/components/output/sinkBox.rs @@ -290,7 +290,7 @@ pub fn start_output_box_listener(conn: Connection, listeners: Arc, si let output_box = sink_box.clone(); let output_box_imp = output_box.imp(); let mut list = output_box_imp.resetSinkList.write().unwrap(); - let index = ir.sink.index; + let sink_index = ir.sink.index; let alias = ir.sink.alias.clone(); let name = ir.sink.name.clone(); let mut is_default = false; @@ -305,11 +305,11 @@ pub fn start_output_box_listener(conn: Connection, listeners: Arc, si let sink_clone = sink_entry.clone(); let entry = Arc::new(ListEntry::new(&*sink_entry)); entry.set_activatable(false); - list.insert(index, (entry.clone(), sink_clone, alias.clone())); + list.insert(sink_index, (entry.clone(), sink_clone, alias.clone())); output_box_imp.resetSinks.append(&*entry); let mut map = output_box_imp.resetSinkMap.write().unwrap(); let mut index = output_box_imp.resetModelIndex.write().unwrap(); - map.insert(alias, (*index, *index, name)); + map.insert(alias, (sink_index, *index, name)); *index += 1; }); });