hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disable systray which has compatibility issue

Browse Source
This commit is contained in:
rustdesk 2021-07-31 03:51:10 +08:00
parent 49dff161dd
commit 935676468b
3 changed files with 331 additions and 580 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

904
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

5
Cargo.toml
View File

@ -6,9 +6,6 @@ edition = "2018"
build= "build.rs" build= "build.rs"
description = "A remote control software." description = "A remote control software."
[lib]
crate-type = ["cdylib", "staticlib", "rlib"]
[features] [features]
inline = [] inline = []
cli = [] cli = []
@ -49,7 +46,7 @@ mac_address = "1.1"
sciter-rs = { git = "https://github.com/open-trade/rust-sciter", branch = "dyn" } sciter-rs = { git = "https://github.com/open-trade/rust-sciter", branch = "dyn" }
[target.'cfg(target_os = "windows")'.dependencies] [target.'cfg(target_os = "windows")'.dependencies]
systray = { git = "https://github.com/open-trade/systray-rs" } #systray = { git = "https://github.com/open-trade/systray-rs" }
winapi = { version = "0.3", features = ["winuser"] } winapi = { version = "0.3", features = ["winuser"] }
winreg = "0.7" winreg = "0.7"
windows-service = { git = 'https://github.com/mullvad/windows-service-rs.git' } windows-service = { git = 'https://github.com/mullvad/windows-service-rs.git' }

2
src/ui.rs
View File

@ -141,6 +141,7 @@ pub fn start(args: &mut [String]) {
#[cfg(windows)] #[cfg(windows)]
fn start_tray() -> hbb_common::ResultType<()> { fn start_tray() -> hbb_common::ResultType<()> {
/*
let mut app = systray::Application::new()?; let mut app = systray::Application::new()?;
let icon = include_bytes!("./tray-icon.ico"); let icon = include_bytes!("./tray-icon.ico");
app.set_icon_from_buffer(icon, 32, 32).unwrap(); app.set_icon_from_buffer(icon, 32, 32).unwrap();
@ -179,6 +180,7 @@ fn start_tray() -> hbb_common::ResultType<()> {
Ok::<_, systray::Error>(()) Ok::<_, systray::Error>(())
})?; })?;
allow_err!(app.wait_for_message()); allow_err!(app.wait_for_message());
*/
Ok(()) Ok(())
} }