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

Merge pull request #2361 from fufesou/fix_wayland_ubuntu_22

Browse Source 
wayalnd, do not share screen when no connections
This commit is contained in:
RustDesk 2022-11-29 22:45:57 +08:00 committed by GitHub
commit da88d5c0b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/server.rs
View File

@ -379,7 +379,6 @@ pub async fn start_server(is_server: bool) {
#[cfg(windows)] #[cfg(windows)]
crate::platform::windows::bootstrap(); crate::platform::windows::bootstrap();
input_service::fix_key_down_timeout_loop(); input_service::fix_key_down_timeout_loop();
allow_err!(video_service::check_init().await);
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
tokio::spawn(async { sync_and_watch_config_dir().await }); tokio::spawn(async { sync_and_watch_config_dir().await });
crate::RendezvousMediator::start_all().await; crate::RendezvousMediator::start_all().await;

15
src/server/video_service.rs
View File

@ -660,6 +660,11 @@ fn run(sp: GenericService) -> ResultType<()> {
std::thread::sleep(spf - elapsed); std::thread::sleep(spf - elapsed);
} }
} }
if !scrap::is_x11() {
super::wayland::release_resouce();
}
Ok(()) Ok(())
} }
@ -764,16 +769,6 @@ fn get_display_num() -> usize {
} }
} }
pub async fn check_init() -> ResultType<()> {
#[cfg(target_os = "linux")]
{
if !scrap::is_x11() {
return super::wayland::check_init().await;
}
}
Ok(())
}
pub(super) fn get_displays_2(all: &Vec<Display>) -> (usize, Vec<DisplayInfo>) { pub(super) fn get_displays_2(all: &Vec<Display>) -> (usize, Vec<DisplayInfo>) {
let mut displays = Vec::new(); let mut displays = Vec::new();
let mut primary = 0; let mut primary = 0;