Fix profile switching deadlock

Author: nekename

src-tauri/src/events/frontend/profiles.rs

@@ -1,7 +1,6 @@
 use super::Error;
 
-use crate::shared::DEVICES;
-use crate::store::profiles::{get_device_profiles, DEVICE_STORES, PROFILE_STORES};
+use crate::store::profiles::{acquire_locks_mut, get_device_profiles, PROFILE_STORES};
 
 use tauri::command;
 
@@ -12,33 +11,29 @@ pub fn get_profiles(device: &str) -> Result<Vec<String>, Error> {
 
 #[command]
 pub async fn get_selected_profile(device: String) -> Result<crate::shared::Profile, Error> {
-	let devices = DEVICES.read().await;
-	if !devices.contains_key(&device) {
+	let mut locks = acquire_locks_mut().await;
+	if !locks.devices.contains_key(&device) {
 		return Err(Error::new(format!("device {device} not found")));
 	}
 
-	let mut device_stores = DEVICE_STORES.write().await;
-	let profile_stores = PROFILE_STORES.read().await;
-	let selected_profile = device_stores.get_selected_profile(&device)?;
-	let profile = profile_stores.get_profile_store(devices.get(&device).unwrap(), &selected_profile)?;
+	let selected_profile = locks.device_stores.get_selected_profile(&device)?;
+	let profile = locks.profile_stores.get_profile_store(locks.devices.get(&device).unwrap(), &selected_profile)?;
 
 	Ok(profile.value.clone())
 }
 
 #[allow(clippy::flat_map_identity)]
 #[command]
 pub async fn set_selected_profile(device: String, id: String) -> Result<(), Error> {
-	let devices = DEVICES.read().await;
-	if !devices.contains_key(&device) {
+	let mut locks = acquire_locks_mut().await;
+	if !locks.devices.contains_key(&device) {
 		return Err(Error::new(format!("device {device} not found")));
 	}
 
-	let mut device_stores = DEVICE_STORES.write().await;
-	let mut profile_stores = PROFILE_STORES.write().await;
-	let selected_profile = device_stores.get_selected_profile(&device)?;
+	let selected_profile = locks.device_stores.get_selected_profile(&device)?;
 
 	if selected_profile != id {
-		let old_profile = &profile_stores.get_profile_store(devices.get(&device).unwrap(), &selected_profile)?.value;
+		let old_profile = &locks.profile_stores.get_profile_store(locks.devices.get(&device).unwrap(), &selected_profile)?.value;
 		for instance in old_profile.keys.iter().flatten().chain(&mut old_profile.sliders.iter().flatten()) {
 			if !matches!(instance.action.uuid.as_str(), "opendeck.multiaction" | "opendeck.toggleaction") {
 				let _ = crate::events::outbound::will_appear::will_disappear(instance, false, false).await;
@@ -52,7 +47,7 @@ pub async fn set_selected_profile(device: String, id: String) -> Result<(), Erro
 	}
 
 	// We must use the mutable version of get_profile_store in order to create the store if it does not exist.
-	let store = profile_stores.get_profile_store_mut(devices.get(&device).unwrap(), &id).await?;
+	let store = locks.profile_stores.get_profile_store_mut(locks.devices.get(&device).unwrap(), &id).await?;
 	let new_profile = &store.value;
 	for instance in new_profile.keys.iter().flatten().chain(&mut new_profile.sliders.iter().flatten()) {
 		if !matches!(instance.action.uuid.as_str(), "opendeck.multiaction" | "opendeck.toggleaction") {
@@ -65,7 +60,7 @@ pub async fn set_selected_profile(device: String, id: String) -> Result<(), Erro
 	}
 	store.save()?;
 
-	device_stores.set_selected_profile(&device, id)?;
+	locks.device_stores.set_selected_profile(&device, id)?;
 
 	Ok(())
 }

src/components/ProfileManager.svelte

@@ -62,7 +62,7 @@
 		if (value == "opendeck_edit_profiles") {
 			if (oldValue) showPopup = true;
 			value = oldValue;
-		} else if (value && (!profile || profile.id != value)) {
+		} else if (value && value != oldValue && (!profile || profile.id != value)) {
 			setProfile(value);
 			oldValue = value;
 		}