mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-11-27 23:19:02 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #4430 from fufesou/feat/custom_resolution

Browse Source 
fix build windows i686
This commit is contained in:
RustDesk 2023-05-20 10:22:06 +08:00 committed by GitHub
commit 4b27bc6804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hbb_common/src/config.rs
View File

@ -1456,7 +1456,7 @@ impl ConfigOidc {
fn _load_env(mut self) -> Self {
use std::env;
for (k, mut v) in &mut self.providers {
for (k, v) in &mut self.providers {
if let Ok(client_id) = env::var(format!("OIDC-{}-CLIENT-ID", k.to_uppercase())) {
v.client_id = client_id;
}

2
src/server/connection.rs
View File

@ -1940,7 +1940,7 @@ impl Connection {
fn change_resolution(&mut self, r: &Resolution) {
if self.keyboard {
if let Ok(name) = video_service::get_current_display_name() {
#[cfg(target_os = "windows")]
#[cfg(all(windows, feature = "virtual_display_driver"))]
if let Some(_ok) =
crate::virtual_display_manager::change_resolution_if_is_virtual_display(
&name,

4
src/server/video_service.rs
View File

@ -897,9 +897,9 @@ pub fn handle_one_frame_encoded(
#[inline]
fn get_original_resolution(display_name: &str, w: usize, h: usize) -> MessageField<Resolution> {
#[cfg(target_os = "windows")]
#[cfg(all(windows, feature = "virtual_display_driver"))]
let is_virtual_display = crate::virtual_display_manager::is_virtual_display(&display_name);
#[cfg(not(target_os = "windows"))]
#[cfg(not(all(windows, feature = "virtual_display_driver")))]
let is_virtual_display = false;
Some(if is_virtual_display {
Resolution {