From 324447ffc81b1abf1345ef8864f13983d21cf66a Mon Sep 17 00:00:00 2001 From: rustdesk Date: Fri, 30 Jun 2023 22:13:16 +0800 Subject: [PATCH] fix sciter bundle --- .github/workflows/flutter-build.yml | 2 -- build.rs | 2 +- src/tray.rs | 5 +++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index cf5cbfd90..5042cc97e 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -189,8 +189,6 @@ jobs: python3 res/inline-sciter.py # Patch sciter x86 sed -i 's/branch = "dyn"/branch = "dyn_x86"/g' ./Cargo.toml - # Replace the link for the ico. - rm res/icon.ico && cp flutter/windows/runner/resources/app_icon.ico res/icon.ico cargo build --features inline --release --bins mkdir -p ./Release mv ./target/release/rustdesk.exe ./Release/rustdesk.exe diff --git a/build.rs b/build.rs index c21b7b985..054eb3700 100644 --- a/build.rs +++ b/build.rs @@ -25,7 +25,7 @@ fn build_manifest() { use std::io::Write; if std::env::var("PROFILE").unwrap() == "release" { let mut res = winres::WindowsResource::new(); - res.set_icon("res/tray-icon.ico") + res.set_icon("res/icon.ico") .set_language(winapi::um::winnt::MAKELANGID( winapi::um::winnt::LANG_ENGLISH, winapi::um::winnt::SUBLANG_ENGLISH_US, diff --git a/src/tray.rs b/src/tray.rs index 092f1edd5..23b7e9b0c 100644 --- a/src/tray.rs +++ b/src/tray.rs @@ -61,6 +61,11 @@ pub fn make_tray() -> hbb_common::ResultType<()> { let mut docker_hiden = false; let open_func = move || { + #[cfg(not(feature = "flutter"))] + { + crate::run_me::<&str>(vec![]).ok(); + return; + } #[cfg(target_os = "macos")] crate::platform::macos::handle_application_should_open_untitled_file(); #[cfg(target_os = "windows")]