mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-12-12 18:29:10 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

refactor tray uninstall service

Browse Source
This commit is contained in:
rustdesk 2023-06-09 22:02:25 +08:00
parent 1ad5d0b726
commit 644da37a4f
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platform/linux.rs
View File

@ -1144,7 +1144,7 @@ pub fn uninstall_service(show_new_window: bool) -> bool {
if show_new_window { if show_new_window {
run_me_with(2); run_me_with(2);
} }
std::process::exit(0); true
} }
pub fn install_service() -> bool { pub fn install_service() -> bool {

2
src/platform/macos.rs
View File

@ -182,7 +182,7 @@ pub fn is_installed_daemon(prompt: bool) -> bool {
false false
} }
pub fn uninstall(show_new_window: bool) -> bool { pub fn uninstall_service(show_new_window: bool) -> bool {
// to-do: do together with win/linux about refactory start/stop service // to-do: do together with win/linux about refactory start/stop service
if !is_installed_daemon(false) { if !is_installed_daemon(false) {
return false; return false;

2
src/platform/windows.rs
View File

@ -2171,7 +2171,7 @@ pub fn uninstall_service(show_new_window: bool) -> bool {
return true; return true;
} }
run_after_run_cmds(!show_new_window); run_after_run_cmds(!show_new_window);
std::process::exit(0); true
} }
pub fn install_service() -> bool { pub fn install_service() -> bool {

4
src/tray.rs
View File

@ -91,10 +91,8 @@ pub fn make_tray() -> hbb_common::ResultType<()> {
if let Ok(event) = menu_channel.try_recv() { if let Ok(event) = menu_channel.try_recv() {
if event.id == quit_i.id() { if event.id == quit_i.id() {
#[cfg(target_os = "macos")]
crate::platform::macos::uninstall(false);
#[cfg(not(target_os = "macos"))]
crate::platform::uninstall_service(false); crate::platform::uninstall_service(false);
*control_flow = ControlFlow::Exit;
} else if event.id == open_i.id() { } else if event.id == open_i.id() {
open_func(); open_func();
} }

3
src/ui_interface.rs
View File

@ -274,7 +274,7 @@ pub fn set_option(key: String, value: String) {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
{ {
let is_stop = value == "Y"; let is_stop = value == "Y";
if is_stop && crate::platform::macos::uninstall(true) { if is_stop && crate::platform::macos::uninstall_service(true) {
return; return;
} }
} }
@ -283,6 +283,7 @@ pub fn set_option(key: String, value: String) {
if crate::platform::is_installed() { if crate::platform::is_installed() {
if value == "Y" { if value == "Y" {
if crate::platform::uninstall_service(true) { if crate::platform::uninstall_service(true) {
std::process::exit(0);
return; return;
} }
} else { } else {