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

Revert "Fix, windows display orders"

Browse Source
This commit is contained in:
RustDesk
2023-11-13 17:31:55 +08:00
committed by GitHub
parent 44e13c84bc
commit 627d21a00a
7 changed files with 26 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/portable_service.rs
View File

@@ -317,7 +317,7 @@ pub mod server {
let current_display = (*para).current_display;
let timeout_ms = (*para).timeout_ms;
if c.is_none() {
let Ok(mut displays) = display_service::try_get_displays(true) else {
let Ok(mut displays) = display_service::try_get_displays() else {
log::error!("Failed to get displays");
*EXIT.lock().unwrap() = true;
return;
@@ -534,7 +534,7 @@ pub mod client {
bail!("already running");
}
if SHMEM.lock().unwrap().is_none() {
let displays = crate::display_service::get_displays(false)?;
let displays = scrap::Display::all()?;
if displays.is_empty() {
bail!("no display available!");
}
@@ -655,7 +655,7 @@ pub mod client {
shmem.write(ADDR_CAPTURE_WOULDBLOCK, &utils::i32_to_vec(TRUE));
}
let (mut width, mut height) = (0, 0);
if let Ok(displays) = display_service::try_get_displays(true) {
if let Ok(displays) = display_service::try_get_displays() {
if let Some(display) = displays.get(current_display) {
width = display.width();
height = display.height();