From c21c5ac0b17da806436c89587878de31b4e73705 Mon Sep 17 00:00:00 2001 From: Thoronium <107363768+NotThorny@users.noreply.github.com> Date: Sat, 22 Apr 2023 16:05:22 -0600 Subject: [PATCH] Fix launch server from args --- src-tauri/src/main.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index db518de..bbefc91 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -110,11 +110,19 @@ async fn parse_args(inp: &Vec) -> Result { if args.value_of("server")? { let server_jar = config.grasscutter_path; + let mut server_path = server_jar.clone(); // Assumes grasscutter jar is named appropriately - let server_path = server_jar.trim_end_matches("grasscutter.jar"); + if server_path.contains('/') { + // Can never panic because of if + let len = server_jar.rfind('/').unwrap(); + server_path.truncate(len); + } else if server_path.contains('\\') { + let len = server_jar.rfind('\\').unwrap(); + server_path.truncate(len); + } let java_path = config.java_path; - system_helpers::run_jar(server_jar.clone(), server_path.to_string(), java_path); + system_helpers::run_jar(server_jar, server_path.to_string(), java_path); } if args.value_of::("host").is_ok() && !args.value_of::("host")?.is_empty() {