diff --git a/src-tauri/src/commands/config.rs b/src-tauri/src/commands/config.rs index d0c8e14..091b190 100644 --- a/src-tauri/src/commands/config.rs +++ b/src-tauri/src/commands/config.rs @@ -1,7 +1,7 @@ use std::path::Path; -use crate::{config::LauncherConfig, util::file::delete_dir}; use crate::util::os::get_installed_vcc_runtime; +use crate::{config::LauncherConfig, util::file::delete_dir}; use semver::Version; use sysinfo::Disks; use tauri::Manager; @@ -122,7 +122,9 @@ pub async fn is_minimum_vcc_runtime_installed( let minimum_version = semver::Version::new(14, 40, 33810); let installed_vcc_runtime_version = get_installed_vcc_runtime(); if installed_vcc_runtime_version.is_none() { - Err(CommandError::Configuration("Unable to check if VCC runtime is installed".to_owned())) + Err(CommandError::Configuration( + "Unable to check if VCC runtime is installed".to_owned(), + )) } else { Ok(installed_vcc_runtime_version.unwrap() >= minimum_version) } diff --git a/src-tauri/src/commands/support.rs b/src-tauri/src/commands/support.rs index 42d5375..884176f 100644 --- a/src-tauri/src/commands/support.rs +++ b/src-tauri/src/commands/support.rs @@ -14,9 +14,10 @@ use tauri::api::path::config_dir; use crate::{ config::LauncherConfig, - util::{os::get_installed_vcc_runtime, zip::{ - append_dir_contents_to_zip, append_file_to_zip, check_if_zip_contains_top_level_file, - }}, + util::{ + os::get_installed_vcc_runtime, + zip::{append_dir_contents_to_zip, append_file_to_zip, check_if_zip_contains_top_level_file}, + }, }; use super::CommandError; diff --git a/src-tauri/src/util/os.rs b/src-tauri/src/util/os.rs index 2bcf6d5..2011f85 100644 --- a/src-tauri/src/util/os.rs +++ b/src-tauri/src/util/os.rs @@ -14,7 +14,7 @@ pub fn open_dir_in_os(dir: String) -> Result<(), std::io::Error> { #[cfg(not(target_os = "windows"))] pub fn get_installed_vcc_runtime() -> Option { - None; + return None; } #[cfg(target_os = "windows")] @@ -33,7 +33,7 @@ pub fn get_installed_vcc_runtime() -> Option { log::error!("VCC runtime exists in the registry but is not marked as installed"); return None; } - }, + } Err(err) => { log::error!("Couldn't determine if VCC runtime was installed: {}", err); return None; @@ -42,21 +42,30 @@ pub fn get_installed_vcc_runtime() -> Option { let patch_version: u32 = match key.get_value("Bld") { Ok(val) => val, Err(err) => { - log::error!("Couldn't determine installed VCC runtime patch version: {}", err); + log::error!( + "Couldn't determine installed VCC runtime patch version: {}", + err + ); return None; } }; let minor_version: u32 = match key.get_value("Minor") { Ok(val) => val, Err(err) => { - log::error!("Couldn't determine installed VCC runtime minor version: {}", err); + log::error!( + "Couldn't determine installed VCC runtime minor version: {}", + err + ); return None; } }; let major_version: u32 = match key.get_value("Major") { Ok(val) => val, Err(err) => { - log::error!("Couldn't determine installed VCC runtime major version: {}", err); + log::error!( + "Couldn't determine installed VCC runtime major version: {}", + err + ); return None; } }; @@ -69,4 +78,4 @@ pub fn get_installed_vcc_runtime() -> Option { return Some(installed_version); } return None; -} \ No newline at end of file +} diff --git a/src/routes/Game.svelte b/src/routes/Game.svelte index 483a8fa..949cdde 100644 --- a/src/routes/Game.svelte +++ b/src/routes/Game.svelte @@ -237,7 +237,7 @@ {$_("gameControls_beta_bugReport_linkPreText")} {$_("gameControls_beta_bugReport_linkText")}