Merge pull request #2361 from fufesou/fix_wayland_ubuntu_22
wayalnd, do not share screen when no connections
This commit is contained in:
		
						commit
						da88d5c0b8
					
				| @ -379,7 +379,6 @@ pub async fn start_server(is_server: bool) { | ||||
|         #[cfg(windows)] | ||||
|         crate::platform::windows::bootstrap(); | ||||
|         input_service::fix_key_down_timeout_loop(); | ||||
|         allow_err!(video_service::check_init().await); | ||||
|         #[cfg(target_os = "macos")] | ||||
|         tokio::spawn(async { sync_and_watch_config_dir().await }); | ||||
|         crate::RendezvousMediator::start_all().await; | ||||
|  | ||||
| @ -660,6 +660,11 @@ fn run(sp: GenericService) -> ResultType<()> { | ||||
|             std::thread::sleep(spf - elapsed); | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     if !scrap::is_x11() { | ||||
|         super::wayland::release_resouce(); | ||||
|     } | ||||
| 
 | ||||
|     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>) { | ||||
|     let mut displays = Vec::new(); | ||||
|     let mut primary = 0; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user