WindyMadman/Cultivation
1
0
Fork 0
mirror of https://github.com/Grasscutters/Cultivation.git synced 2025-01-09 04:27:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Thoronium 2023-02-26 01:44:01 -07:00 committed by GitHub
parent 85a16e3407
commit f2e3c69c0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src-tauri/src/file_helpers.rs
View File

@ -132,7 +132,7 @@ pub fn read_file(path: String) -> String {
Ok(file) => file,
Err(e) => {
// Send back error for handling by the caller
return e;
return null;
}
};

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

@ -97,9 +97,9 @@ pub fn unzip(
}
// If downloading full build, emit that the jar was extracted with it
if zipfile = "GrasscutterCulti3.4.zip" {
if zipfile == "GrasscutterCulti3.4.zip" {
window
.emit("jar_extracted", destpath.to_string() + (destpath.to_string() + "grasscutter.jar"))
.emit("jar_extracted", destpath.to_string() + &((destpath.to_string() + "grasscutter.jar")))
.unwrap();
}

6
src/utils/server.ts
View File

@ -40,5 +40,11 @@ export async function encryptionEnabled(path: string) {
return false
}
// Also check if null just in case
if (serverConf == null) {
console.log(`Server config at ${path} not found or invalid. Be sure to run the server at least once to generate it`)
return false
}
return serverConf.server.http.encryption.useEncryption
}