TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-03-21 12:11:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix kill main window in --server

Browse Source
This commit is contained in:
rustdesk
2024-06-18 22:04:34 +08:00
parent 8c39979848
commit e57854422a
2 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/server.rs
View File

@@ -467,12 +467,9 @@ pub async fn start_server(is_server: bool) {
std::thread::spawn(move || {
if let Err(err) = crate::ipc::start("") {
log::error!("Failed to start ipc: {}", err);
#[cfg(windows)]
if crate::is_server() && crate::ipc::is_ipc_file_exist("").unwrap_or(false) {
if crate::is_server() {
log::error!("ipc is occupied by another process, try kill it");
if let Err(e) = crate::platform::try_kill_rustdesk_main_window_process() {
log::error!("kill failed: {}", e);
}
std::thread::spawn(stop_main_window_process).join().ok();
}
std::process::exit(-1);
}
@@ -636,3 +633,19 @@ async fn sync_and_watch_config_dir() {
}
log::warn!("skipped config sync");
}
#[tokio::main(flavor = "current_thread")]
pub async fn stop_main_window_process() {
// this may also kill another --server process,
// but --server usually can be auto restarted by --service, so it is ok
if let Ok(mut conn) = crate::ipc::connect(1000, "").await {
conn.send(&crate::ipc::Data::Close).await.ok();
}
#[cfg(windows)]
{
// in case above failure, e.g. zombie process
if let Err(e) = crate::platform::try_kill_rustdesk_main_window_process() {
log::error!("kill failed: {}", e);
}
}
}