TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-17 04:01:29 +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

7
src/server/wayland.rs
View File

@@ -1,6 +1,6 @@
use super::*;
use hbb_common::{allow_err, platform::linux::DISTRO};
use scrap::{is_cursor_embedded, set_map_err, Capturer, Frame, TraitCapturer};
use scrap::{is_cursor_embedded, set_map_err, Capturer, Display, Frame, TraitCapturer};
use std::io;
use std::process::{Command, Output};
@@ -139,7 +139,7 @@ pub(super) async fn check_init() -> ResultType<()> {
if *CAP_DISPLAY_INFO.read().unwrap() == 0 {
let mut lock = CAP_DISPLAY_INFO.write().unwrap();
if *lock == 0 {
let mut all = super::display_service::get_displays(true)?;
let mut all = Display::all()?;
let num = all.len();
let primary = super::display_service::get_primary_2(&all);
let current = primary;
@@ -186,7 +186,8 @@ pub(super) async fn check_init() -> ResultType<()> {
maxy = max_height;
let capturer = Box::into_raw(Box::new(
Capturer::new(display).with_context(|| "Failed to create capturer")?,
Capturer::new(display)
.with_context(|| "Failed to create capturer")?,
));
let capturer = CapturerPtr(capturer);
let cap_display_info = Box::into_raw(Box::new(CapDisplayInfo {