Skip to content

Commit

Permalink
github: update jak 2 bug ticket link
Browse files Browse the repository at this point in the history
  • Loading branch information
xTVaser committed Oct 3, 2024
1 parent 0e80d0d commit cb409dc
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 11 deletions.
6 changes: 4 additions & 2 deletions src-tauri/src/commands/config.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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)
}
Expand Down
7 changes: 4 additions & 3 deletions src-tauri/src/commands/support.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
19 changes: 14 additions & 5 deletions src-tauri/src/util/os.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pub fn get_installed_vcc_runtime() -> Option<semver::Version> {
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;
Expand All @@ -42,21 +42,30 @@ pub fn get_installed_vcc_runtime() -> Option<semver::Version> {
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;
}
};
Expand All @@ -69,4 +78,4 @@ pub fn get_installed_vcc_runtime() -> Option<semver::Version> {
return Some(installed_version);
}
return None;
}
}
2 changes: 1 addition & 1 deletion src/routes/Game.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
{$_("gameControls_beta_bugReport_linkPreText")}
<a
class="text-blue-400"
href="https://github.com/open-goal/jak-project/issues/new?assignees=&labels=bug%2Cjak2&projects=&template=jak2-bug-report.yml"
href="https://github.com/open-goal/jak-project/issues/new?template=jak2-bug-report.yml"
target="_blank"
rel="noopener noreferrer"
>{$_("gameControls_beta_bugReport_linkText")}</a
Expand Down

0 comments on commit cb409dc

Please sign in to comment.