Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-04-04 13:02:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Use splice instead of remove to remove udef behavior

Browse source
This commit is contained in:
Fabio Lenherr / DashieTM 2023-12-17 21:48:25 +01:00
parent c3fa24ddc8
commit e0a672935e
3 changed files with 150 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

191
flatpak/cargo-sources.json
View file

@ -155,6 +155,84 @@
"dest": "cargo/vendor/cfg-if-1.0.0",
"dest-filename": ".cargo-checksum.json"
},
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/crossbeam/crossbeam-0.8.2.crate",
"sha256": "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c",
"dest": "cargo/vendor/crossbeam-0.8.2"
},
{
"type": "inline",
"contents": "{\"package\": \"2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c\", \"files\": {}}",
"dest": "cargo/vendor/crossbeam-0.8.2",
"dest-filename": ".cargo-checksum.json"
},
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.9.crate",
"sha256": "14c3242926edf34aec4ac3a77108ad4854bffaa2e4ddc1824124ce59231302d5",
"dest": "cargo/vendor/crossbeam-channel-0.5.9"
},
{
"type": "inline",
"contents": "{\"package\": \"14c3242926edf34aec4ac3a77108ad4854bffaa2e4ddc1824124ce59231302d5\", \"files\": {}}",
"dest": "cargo/vendor/crossbeam-channel-0.5.9",
"dest-filename": ".cargo-checksum.json"
},
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.8.4.crate",
"sha256": "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751",
"dest": "cargo/vendor/crossbeam-deque-0.8.4"
},
{
"type": "inline",
"contents": "{\"package\": \"fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751\", \"files\": {}}",
"dest": "cargo/vendor/crossbeam-deque-0.8.4",
"dest-filename": ".cargo-checksum.json"
},
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/crossbeam-epoch/crossbeam-epoch-0.9.16.crate",
"sha256": "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa",
"dest": "cargo/vendor/crossbeam-epoch-0.9.16"
},
{
"type": "inline",
"contents": "{\"package\": \"2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa\", \"files\": {}}",
"dest": "cargo/vendor/crossbeam-epoch-0.9.16",
"dest-filename": ".cargo-checksum.json"
},
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/crossbeam-queue/crossbeam-queue-0.3.9.crate",
"sha256": "b9bcf5bdbfdd6030fb4a1c497b5d5fc5921aa2f60d359a17e249c0e6df3de153",
"dest": "cargo/vendor/crossbeam-queue-0.3.9"
},
{
"type": "inline",
"contents": "{\"package\": \"b9bcf5bdbfdd6030fb4a1c497b5d5fc5921aa2f60d359a17e249c0e6df3de153\", \"files\": {}}",
"dest": "cargo/vendor/crossbeam-queue-0.3.9",
"dest-filename": ".cargo-checksum.json"
},
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.17.crate",
"sha256": "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f",
"dest": "cargo/vendor/crossbeam-utils-0.8.17"
},
{
"type": "inline",
"contents": "{\"package\": \"c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f\", \"files\": {}}",
"dest": "cargo/vendor/crossbeam-utils-0.8.17",
"dest-filename": ".cargo-checksum.json"
},
{
"type": "archive",
"archive-type": "tar-gzip",
@ -457,14 +535,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/glib/glib-0.18.3.crate",
"sha256": "58cf801b6f7829fa76db37449ab67c9c98a2b1bf21076d9113225621e61a0fa6",
"dest": "cargo/vendor/glib-0.18.3"
"url": "https://static.crates.io/crates/glib/glib-0.18.4.crate",
"sha256": "951bbd7fdc5c044ede9f05170f05a3ae9479239c3afdfe2d22d537a3add15c4e",
"dest": "cargo/vendor/glib-0.18.4"
},
{
"type": "inline",
"contents": "{\"package\": \"58cf801b6f7829fa76db37449ab67c9c98a2b1bf21076d9113225621e61a0fa6\", \"files\": {}}",
"dest": "cargo/vendor/glib-0.18.3",
"contents": "{\"package\": \"951bbd7fdc5c044ede9f05170f05a3ae9479239c3afdfe2d22d537a3add15c4e\", \"files\": {}}",
"dest": "cargo/vendor/glib-0.18.4",
"dest-filename": ".cargo-checksum.json"
},
{
@ -808,14 +886,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/mio/mio-0.8.10.crate",
"sha256": "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09",
"dest": "cargo/vendor/mio-0.8.10"
"url": "https://static.crates.io/crates/mio/mio-0.8.9.crate",
"sha256": "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0",
"dest": "cargo/vendor/mio-0.8.9"
},
{
"type": "inline",
"contents": "{\"package\": \"8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09\", \"files\": {}}",
"dest": "cargo/vendor/mio-0.8.10",
"contents": "{\"package\": \"3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0\", \"files\": {}}",
"dest": "cargo/vendor/mio-0.8.9",
"dest-filename": ".cargo-checksum.json"
},
{
@ -873,14 +951,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/once_cell/once_cell-1.19.0.crate",
"sha256": "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92",
"dest": "cargo/vendor/once_cell-1.19.0"
"url": "https://static.crates.io/crates/once_cell/once_cell-1.18.0.crate",
"sha256": "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d",
"dest": "cargo/vendor/once_cell-1.18.0"
},
{
"type": "inline",
"contents": "{\"package\": \"3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92\", \"files\": {}}",
"dest": "cargo/vendor/once_cell-1.19.0",
"contents": "{\"package\": \"dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d\", \"files\": {}}",
"dest": "cargo/vendor/once_cell-1.18.0",
"dest-filename": ".cargo-checksum.json"
},
{
@ -964,14 +1042,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-2.0.1.crate",
"sha256": "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a",
"dest": "cargo/vendor/proc-macro-crate-2.0.1"
"url": "https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-2.0.0.crate",
"sha256": "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8",
"dest": "cargo/vendor/proc-macro-crate-2.0.0"
},
{
"type": "inline",
"contents": "{\"package\": \"97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a\", \"files\": {}}",
"dest": "cargo/vendor/proc-macro-crate-2.0.1",
"contents": "{\"package\": \"7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8\", \"files\": {}}",
"dest": "cargo/vendor/proc-macro-crate-2.0.0",
"dest-filename": ".cargo-checksum.json"
},
{
@ -1029,14 +1107,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/re_set-lib/re_set-lib-0.8.5.crate",
"sha256": "553f659e88565f7f92b9be1f5fb1643260e90cfc37efc40c03125da4e16f3103",
"dest": "cargo/vendor/re_set-lib-0.8.5"
"url": "https://static.crates.io/crates/re_set-lib/re_set-lib-0.8.6.crate",
"sha256": "784e1a4d367fcfc427ea2b199d1307fbaf6992a1e728893b5cd45af5e52e04d2",
"dest": "cargo/vendor/re_set-lib-0.8.6"
},
{
"type": "inline",
"contents": "{\"package\": \"553f659e88565f7f92b9be1f5fb1643260e90cfc37efc40c03125da4e16f3103\", \"files\": {}}",
"dest": "cargo/vendor/re_set-lib-0.8.5",
"contents": "{\"package\": \"784e1a4d367fcfc427ea2b199d1307fbaf6992a1e728893b5cd45af5e52e04d2\", \"files\": {}}",
"dest": "cargo/vendor/re_set-lib-0.8.6",
"dest-filename": ".cargo-checksum.json"
},
{
@ -1068,14 +1146,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/reset_daemon/reset_daemon-0.6.1.crate",
"sha256": "65079f1d86d15af21811551ea55daf2a05f654c9a27943c918e23d55aa9e4af3",
"dest": "cargo/vendor/reset_daemon-0.6.1"
"url": "https://static.crates.io/crates/reset_daemon/reset_daemon-0.6.9.crate",
"sha256": "d6d6cf20149b91a640b3146d20601b9c5dad1eceececfa2cd590943d7cc24cb8",
"dest": "cargo/vendor/reset_daemon-0.6.9"
},
{
"type": "inline",
"contents": "{\"package\": \"65079f1d86d15af21811551ea55daf2a05f654c9a27943c918e23d55aa9e4af3\", \"files\": {}}",
"dest": "cargo/vendor/reset_daemon-0.6.1",
"contents": "{\"package\": \"d6d6cf20149b91a640b3146d20601b9c5dad1eceececfa2cd590943d7cc24cb8\", \"files\": {}}",
"dest": "cargo/vendor/reset_daemon-0.6.9",
"dest-filename": ".cargo-checksum.json"
},
{
@ -1302,27 +1380,27 @@
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/toml/toml-0.8.2.crate",
"sha256": "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d",
"dest": "cargo/vendor/toml-0.8.2"
"url": "https://static.crates.io/crates/toml/toml-0.8.8.crate",
"sha256": "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35",
"dest": "cargo/vendor/toml-0.8.8"
},
{
"type": "inline",
"contents": "{\"package\": \"185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d\", \"files\": {}}",
"dest": "cargo/vendor/toml-0.8.2",
"contents": "{\"package\": \"a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35\", \"files\": {}}",
"dest": "cargo/vendor/toml-0.8.8",
"dest-filename": ".cargo-checksum.json"
},
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/toml_datetime/toml_datetime-0.6.3.crate",
"sha256": "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b",
"dest": "cargo/vendor/toml_datetime-0.6.3"
"url": "https://static.crates.io/crates/toml_datetime/toml_datetime-0.6.5.crate",
"sha256": "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1",
"dest": "cargo/vendor/toml_datetime-0.6.5"
},
{
"type": "inline",
"contents": "{\"package\": \"7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b\", \"files\": {}}",
"dest": "cargo/vendor/toml_datetime-0.6.3",
"contents": "{\"package\": \"3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1\", \"files\": {}}",
"dest": "cargo/vendor/toml_datetime-0.6.5",
"dest-filename": ".cargo-checksum.json"
},
{
@ -1341,14 +1419,27 @@
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/toml_edit/toml_edit-0.20.2.crate",
"sha256": "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338",
"dest": "cargo/vendor/toml_edit-0.20.2"
"url": "https://static.crates.io/crates/toml_edit/toml_edit-0.20.7.crate",
"sha256": "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81",
"dest": "cargo/vendor/toml_edit-0.20.7"
},
{
"type": "inline",
"contents": "{\"package\": \"396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338\", \"files\": {}}",
"dest": "cargo/vendor/toml_edit-0.20.2",
"contents": "{\"package\": \"70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81\", \"files\": {}}",
"dest": "cargo/vendor/toml_edit-0.20.7",
"dest-filename": ".cargo-checksum.json"
},
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/toml_edit/toml_edit-0.21.0.crate",
"sha256": "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03",
"dest": "cargo/vendor/toml_edit-0.21.0"
},
{
"type": "inline",
"contents": "{\"package\": \"d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03\", \"files\": {}}",
"dest": "cargo/vendor/toml_edit-0.21.0",
"dest-filename": ".cargo-checksum.json"
},
{
@ -1562,14 +1653,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/winnow/winnow-0.5.26.crate",
"sha256": "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff",
"dest": "cargo/vendor/winnow-0.5.26"
"url": "https://static.crates.io/crates/winnow/winnow-0.5.19.crate",
"sha256": "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b",
"dest": "cargo/vendor/winnow-0.5.19"
},
{
"type": "inline",
"contents": "{\"package\": \"b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff\", \"files\": {}}",
"dest": "cargo/vendor/winnow-0.5.26",
"contents": "{\"package\": \"829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b\", \"files\": {}}",
"dest": "cargo/vendor/winnow-0.5.19",
"dest-filename": ".cargo-checksum.json"
},
{

2
src/components/input/source_box.rs
View file

@ -470,7 +470,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
}
for entry in 0..*index {
if model_list.string(entry) == Some(alias.clone().into()) {
model_list.remove(entry);
model_list.splice(entry, 1, &[]);
break;
}
}

11
src/components/output/sink_box.rs
View file

@ -462,21 +462,26 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
output_box_imp
.reset_sinks
.remove(&*entry.clone().unwrap().0);
let mut map = output_box_imp.reset_sink_map.write().unwrap();
let alias = entry.unwrap().2;
map.remove(&alias);
let mut index = output_box_imp.reset_model_index.write().unwrap();
let model_list = output_box_imp.reset_model_list.write().unwrap();
// add dummy entry when no other devices are available
if *index == 1 {
model_list.append("Dummy Output");
}
let mut map = output_box_imp.reset_sink_map.write().unwrap();
map.remove(&alias);
for entry in 0..*index {
if model_list.string(entry) == Some(alias.clone().into()) {
model_list.remove(entry);
model_list.splice(entry, 1, &[]);
break;
}
}
// dummy enforces a minimum of 1
if *index > 1 {
*index -= 1;
}