TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-03-23 05:00:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feat/x11/clipboard-file/init

Browse Source 
Signed-off-by: 蔡略 <cailue@bupt.edu.cn>
This commit is contained in:
蔡略
2023-09-08 20:09:57 +08:00
parent 25cf36a948 cc3ff284f7
commit a7bb90e7e6
302 changed files with 14257 additions and 6606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tray.rs
View File

@@ -61,7 +61,7 @@ pub fn make_tray() -> hbb_common::ResultType<()> {
let mut docker_hiden = false;
let open_func = move || {
#[cfg(not(feature = "flutter"))]
if cfg!(not(feature = "flutter"))
{
crate::run_me::<&str>(vec![]).ok();
return;
@@ -101,11 +101,15 @@ pub fn make_tray() -> hbb_common::ResultType<()> {
if let Ok(event) = menu_channel.try_recv() {
if event.id == quit_i.id() {
/* failed in windows, seems no permission to check system process
if !crate::check_process("--server", false) {
*control_flow = ControlFlow::Exit;
return;
}
crate::platform::uninstall_service(false);
*/
if !crate::platform::uninstall_service(false) {
*control_flow = ControlFlow::Exit;
}
} else if event.id == open_i.id() {
open_func();
}