diff options
| author |  bigfoot547 <[email protected]> | 2025-01-21 16:36:33 -0600 |
|---|---|---|
| committer | bigfoot547 <[email protected]> | 2025-01-21 17:07:07 -0600 |
| commit | a11b8764f1be5124b5a81a39809cfeb520f4a96d (patch) | |
| tree | 7465f8c1c4913bcb668b66eb5f8230cee59211e1 /src/launcher.rs | |
| parent | random small changes (diff) | |
strip verbatim prefix \\?\ from paths on windows
without this, java freaks out
(amended to remove an artifact, arguments.txt)
Diffstat (limited to 'src/launcher.rs')
| -rw-r--r-- | src/launcher.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/launcher.rs b/src/launcher.rs index 348639d..40d9742 100644 --- a/src/launcher.rs +++ b/src/launcher.rs @@ -16,7 +16,7 @@ use std::ffi::{OsStr, OsString}; use std::fmt::{Display, Formatter}; use std::io::ErrorKind; use std::io::ErrorKind::AlreadyExists; -use std::path::{Component, Path, PathBuf}; +use std::path::{Component, Path, PathBuf, Prefix}; use std::{env, process}; use std::env::JoinPathsError; use std::time::{Instant, SystemTime, UNIX_EPOCH}; @@ -36,7 +36,7 @@ use version::{VersionList, VersionResolveError, VersionResult}; use crate::version::{Logging, Library, OSRestriction, OperatingSystem, DownloadType, DownloadInfo, LibraryExtractRule, CompleteVersion, FeatureMatcher}; use assets::{AssetError, AssetRepository}; -use crate::util::{self, FileVerifyError, IntegrityError}; +use crate::util::{self, AsJavaPath, FileVerifyError, IntegrityError}; pub use settings::*; pub use runner::run_the_game; @@ -551,8 +551,8 @@ impl Launcher { info!("Building classpath"); let classpath = env::join_paths(downloads.iter() - .map(|job| job.get_path()) - .chain(client_jar_path.iter().map(|p| p.as_path()))) + .map(|job| job.get_path().as_java_path()) + .chain(client_jar_path.iter().map(|p| p.as_path().as_java_path()))) .map_err(|e| LaunchError::LibraryClasspathError(e))? .into_string() .unwrap_or_else(|os| { |