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

fix: headless, plug in multiple virtual displays (#7912)

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2024-05-06 13:34:31 +08:00 committed by GitHub
parent 7391271107
commit b5a88d00af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/virtual_display_manager.rs
View File

@ -405,6 +405,7 @@ pub mod amyuni_idd {
use crate::platform::win_device;
use hbb_common::{bail, lazy_static, log, tokio::time::Instant, ResultType};
use std::{
ops::Sub,
ptr::null_mut,
sync::{Arc, Mutex},
time::Duration,
@ -427,6 +428,7 @@ pub mod amyuni_idd {
lazy_static::lazy_static! {
static ref LOCK: Arc<Mutex<()>> = Default::default();
static ref LAST_PLUG_IN_HEADLESS_TIME: Arc<Mutex<Instant>> = Arc::new(Mutex::new(Instant::now().sub(Duration::from_secs(100))));
}
fn get_deviceinstaller64_work_dir() -> ResultType<Option<Vec<u8>>> {
@ -570,9 +572,12 @@ pub mod amyuni_idd {
}
pub fn plug_in_headless() -> ResultType<()> {
if get_monitor_count() > 0 {
return Ok(());
let mut tm = LAST_PLUG_IN_HEADLESS_TIME.lock().unwrap();
if tm.elapsed() < Duration::from_secs(3) {
bail!("Plugging in too frequently.");
}
*tm = Instant::now();
drop(tm);
let mut is_async = false;
if let Err(e) = check_install_driver(&mut is_async) {