Skip to content

Commit 8bd6c7c

Browse files
committed
fix panic in server bootstrap
1 parent d06deac commit 8bd6c7c

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

src/main.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ async fn main() {
3030
if let Ok(_) = crate::ui::gui::run().await {
3131
return;
3232
}
33+
#[cfg(windows)]
34+
hide_console_ng::show_unconditionally();
3335
}
3436

3537
crate::ui::cli::run().await

src/ui/cli.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ async fn do_install(
239239
let loader_versions = all_loader_versions.get(&loader_type).unwrap();
240240
let loader_version = get_loader_version(matches, loader_versions)?;
241241
let location = matches.get_one::<PathBuf>("dir").unwrap().clone();
242+
let include_flap = !matches.get_flag("exclude-flap");
242243
if let Some(matches) = matches.subcommand_matches("run") {
243244
let java = matches.get_one::<PathBuf>("java");
244245
let run_args = matches.get_one::<String>("args");
@@ -250,7 +251,7 @@ async fn do_install(
250251
loader_version,
251252
info.calamus_generation,
252253
location,
253-
!matches.get_flag("exclude-flap"),
254+
include_flap,
254255
java,
255256
run_args.map(|s| s.split(" ")),
256257
)
@@ -269,7 +270,7 @@ async fn do_install(
269270
info.calamus_generation,
270271
location,
271272
matches.get_flag("download-minecraft"),
272-
!matches.get_flag("exclude-flap"),
273+
include_flap,
273274
)
274275
.await?;
275276
return Ok(InstallationResult::Installed);

0 commit comments

Comments
 (0)