From db55aaabfb9a13bb99ab84ffbf84229c00a83efe Mon Sep 17 00:00:00 2001
From: LynithDev <61880709+LynithDev@users.noreply.github.com>
Date: Sun, 15 Dec 2024 18:47:12 +0100
Subject: [PATCH] fix: Settings desync between frontend and backend

---
 apps/frontend/src/ui/hooks/useSettings.tsx | 4 ++++
 packages/core/src/api/java.rs              | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/frontend/src/ui/hooks/useSettings.tsx b/apps/frontend/src/ui/hooks/useSettings.tsx
index e30cc942..e817f5c5 100644
--- a/apps/frontend/src/ui/hooks/useSettings.tsx
+++ b/apps/frontend/src/ui/hooks/useSettings.tsx
@@ -17,6 +17,7 @@ interface SettingsControllerType {
 	settings: () => Settings;
 	saveOnLeave: (settings: () => Partial<Settings>) => void;
 	save: (settings: Settings) => Promise<void>;
+	refetch: () => void;
 }
 
 const SettingsContext = createContext() as Context<SettingsControllerType>;
@@ -44,6 +45,7 @@ export function SettingsProvider(props: ParentProps) {
 			syncSettings(settings);
 			await refetch();
 		},
+		refetch,
 	};
 
 	if (getProgramInfo().dev_build)
@@ -65,6 +67,8 @@ export function useSettings() {
 	if (!context)
 		throw new Error('useSettingsContext should be called inside its SettingsProvider');
 
+	context.refetch();
+
 	return context;
 }
 
diff --git a/packages/core/src/api/java.rs b/packages/core/src/api/java.rs
index 75aabb88..a16a8e70 100644
--- a/packages/core/src/api/java.rs
+++ b/packages/core/src/api/java.rs
@@ -54,7 +54,7 @@ pub async fn install_java_from_major(java_version: u32) -> crate::Result<PathBuf
 	let package = packages
 		.into_iter()
 		.find(|p| p.java_version.contains(&java_version))
-		.ok_or(anyhow::anyhow!(
+		.ok_or_else(|| anyhow::anyhow!(
 			"Could not find a java package for version {}",
 			java_version
 		))?;
@@ -65,7 +65,7 @@ pub async fn install_java_from_major(java_version: u32) -> crate::Result<PathBuf
 #[onelauncher_macros::memory]
 pub async fn install_java_from_package(download: JavaZuluPackage) -> crate::Result<PathBuf> {
 	let state = State::get().await?;
-	let java_version = *download.java_version.get(0).unwrap_or(&0);
+	let java_version = *download.java_version.first().unwrap_or(&0);
 
 	let ingress = init_ingress(
 		crate::IngressType::DownloadJava {