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

fix: win remote and file transfer , simultaneous connection

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2022-10-31 10:04:59 +08:00
parent e263acef3e
commit d6c9639c5d
7 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/video_service.rs
View File

@@ -468,6 +468,7 @@ fn run(sp: GenericService) -> ResultType<()> {
#[cfg(windows)]
start_uac_elevation_check();
#[cfg(target_os = "linux")]
let mut would_block_count = 0u32;
while sp.ok() {
@@ -570,9 +571,9 @@ fn run(sp: GenericService) -> ResultType<()> {
try_gdi += 1;
}
would_block_count += 1;
#[cfg(target_os = "linux")]
{
would_block_count += 1;
if !scrap::is_x11() {
if would_block_count >= 100 {
// For now, the user should choose and agree screen sharing agiain.
@@ -600,7 +601,10 @@ fn run(sp: GenericService) -> ResultType<()> {
return Err(err.into());
}
_ => {
would_block_count = 0;
#[cfg(target_os = "linux")]
{
would_block_count = 0;
}
}
}