weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6565 from fufesou/fix/elevated_switch_display

Browse Source 
fix, elevated mode, switch display
This commit is contained in:
RustDesk
2023-11-30 00:18:14 +08:00
committed by GitHub
parent eac6835982 d66e087d94
commit 64ed25879c
40 changed files with 59 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/server/connection.rs
View File

@@ -2332,6 +2332,22 @@ impl Connection {
}
async fn capture_displays(&mut self, add: &[usize], sub: &[usize], set: &[usize]) {
#[cfg(windows)]
if portable_client::running() && (add.len() > 0 || set.len() > 1) {
log::info!("Capturing multiple displays is not supported in the elevated mode.");
let mut msg_out = Message::new();
let res = MessageBox {
msgtype: "nook-nocancel-hasclose".to_owned(),
title: "Prompt".to_owned(),
text: "capture_display_elevated_connections_tip".to_owned(),
link: "".to_owned(),
..Default::default()
};
msg_out.set_message_box(res);
self.send(msg_out).await;
return;
}
if let Some(sever) = self.server.upgrade() {
let mut lock = sever.write().unwrap();
for display in add.iter() {

10
src/server/portable_service.rs
View File

@@ -878,15 +878,7 @@ pub mod client {
}
if portable_service_running {
log::info!("Create shared memory capturer");
if current_display == *display_service::PRIMARY_DISPLAY_IDX {
return Ok(Box::new(CapturerPortable::new(current_display)));
} else {
bail!(
"Ignore capture display index: {}, the primary display index is: {}",
current_display,
*display_service::PRIMARY_DISPLAY_IDX
);
}
return Ok(Box::new(CapturerPortable::new(current_display)));
} else {
log::debug!("Create capturer dxgi|gdi");
return Ok(Box::new(