Mirror/Cultivation
1
0
Fork 0
mirror of https://github.com/Grasscutters/Cultivation.git synced 2025-12-12 23:24:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crashing on null configs

Browse Source
This commit is contained in:
Thoronium
2023-08-29 15:17:31 -06:00
parent 09f5e74b51
commit 843913a664
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src-tauri/src/config.rs
View File

@@ -3,7 +3,7 @@ use std::path::PathBuf;
use std::string::String; use std::string::String;
// Config may not exist, or may be old, so it's okay if these are optional // Config may not exist, or may be old, so it's okay if these are optional
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug, Default)]
pub struct Configuration { pub struct Configuration {
pub toggle_grasscutter: Option<bool>, pub toggle_grasscutter: Option<bool>,
pub game_install_path: Option<String>, pub game_install_path: Option<String>,
@@ -41,7 +41,7 @@ pub fn config_path() -> PathBuf {
pub fn get_config() -> Configuration { pub fn get_config() -> Configuration {
let path = config_path(); let path = config_path();
let config = std::fs::read_to_string(path).unwrap_or("{}".to_string()); let config = std::fs::read_to_string(path).unwrap_or("{}".to_string());
let config: Configuration = serde_json::from_str(&config).unwrap(); let config: Configuration = serde_json::from_str(&config).unwrap_or_default();
config config
} }