diff options
| author |   Begonia, HE <163421589+BegoniaHe@users.noreply.github.com> | 2026-01-29 03:20:10 +0100 |
|---|---|---|
| committer | Begonia, HE <163421589+BegoniaHe@users.noreply.github.com> | 2026-01-29 03:20:10 +0100 |
| commit | 5d630a24bed07dca20b6ddf55ffe4be36399ad0f (patch) | |
| tree | 8d38ce794f4b31ad1de9e61738eba125acc39ddd /src-tauri/src/main.rs | |
| parent | c46d6c51b8bec6a52ca66087ef9b8edc48d809a3 (diff) | |
| download | DropOut-5d630a24bed07dca20b6ddf55ffe4be36399ad0f.tar.gz DropOut-5d630a24bed07dca20b6ddf55ffe4be36399ad0f.zip | |
fix: resolve rebase conflicts and compilation errors
- Export JavaError from java module
- Fix type mismatches in Adoptium provider methods
- Add type annotations for reqwest json() calls
- Remove non-existent cache_version field from JavaCatalog
- Fix resolve_java_for_launch call signature (remove extra window param)
- Add error conversion to String for Tauri commands
- Fix import for save_catalog_cache in adoptium.rs
Reviewed-by: Claude Sonnet 4.5
Diffstat (limited to 'src-tauri/src/main.rs')
| -rw-r--r-- | src-tauri/src/main.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 7984ea8..b74c746 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -208,7 +208,6 @@ async fn start_game( let java_installation = core::java::priority::resolve_java_for_launch( app_handle, - &window, instance.java_path_override.as_deref(), Some(&config.java_path), required_java_major, |