Skip to content

Commit a395b84

Browse files
committed
2.3.0-rc.1
1 parent 96bc3eb commit a395b84

2 files changed

Lines changed: 16 additions & 27 deletions

File tree

‎package-lock.json‎

Lines changed: 8 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src-tauri/src/lib.rs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ use log::*;
2727
use tauri::Manager;
2828
use uuid::Uuid;
2929

30-
use crate::{config::WebPlayerArchitecture, state::{LaunchProfile, LaunchProfilesView}};
30+
use crate::{
31+
config::WebPlayerArchitecture,
32+
state::{LaunchProfile, LaunchProfilesView},
33+
};
3134

3235
type Error = Box<dyn std::error::Error>;
3336
type Result<T> = std::result::Result<T, Error>;
@@ -398,7 +401,7 @@ async fn prep_launch(
398401
WebPlayerArchitecture::X64 => "ffrunner64.exe",
399402
WebPlayerArchitecture::X86 => "ffrunner.exe",
400403
});
401-
404+
402405
let mut cmd = std::process::Command::new(ffrunner_path.clone());
403406
cmd.current_dir(working_dir);
404407

@@ -553,7 +556,9 @@ async fn prep_launch(
553556
// Assets served over web.
554557
// The 64-bit web player uses ffrunner for asset downloading, so try to
555558
// upgrade the asset URL to HTTPS, if it's available, since ffrunner supports it
556-
if asset_url.starts_with("http://") && state.config.game.web_player_architecture == WebPlayerArchitecture::X64 {
559+
if asset_url.starts_with("http://")
560+
&& state.config.game.web_player_architecture == WebPlayerArchitecture::X64
561+
{
557562
let new_asset_url = asset_url.replacen("http://", "https://", 1);
558563
if util::supports_https(&new_asset_url).await {
559564
asset_url = new_asset_url;

0 commit comments

Comments
 (0)