mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-01-19 16:33:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4543 from fufesou/fix/default_peer_options

Browse Source 
fix default peer options
This commit is contained in:
RustDesk 2023-06-04 20:10:31 +08:00 committed by GitHub
commit 3459ec722b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,6 +107,9 @@ macro_rules! serde_field_string {
{
let s: String =
de::Deserialize::deserialize(deserializer).unwrap_or(Self::$default_func());
if s.is_empty() {
return Ok(Self::$default_func());
}
Ok(s)
}
};
@ -206,22 +209,26 @@ pub struct PeerConfig {
pub size_pf: Size,
#[serde(
default = "PeerConfig::default_view_style",
deserialize_with = "PeerConfig::deserialize_view_style"
deserialize_with = "PeerConfig::deserialize_view_style",
skip_serializing_if = "String::is_empty"
)]
pub view_style: String,
#[serde(
default = "PeerConfig::default_scroll_style",
deserialize_with = "PeerConfig::deserialize_scroll_style"
deserialize_with = "PeerConfig::deserialize_scroll_style",
skip_serializing_if = "String::is_empty"
)]
pub scroll_style: String,
#[serde(
default = "PeerConfig::default_image_quality",
deserialize_with = "PeerConfig::deserialize_image_quality"
deserialize_with = "PeerConfig::deserialize_image_quality",
skip_serializing_if = "String::is_empty"
)]
pub image_quality: String,
#[serde(
default = "PeerConfig::default_custom_image_quality",
deserialize_with = "PeerConfig::deserialize_custom_image_quality"
deserialize_with = "PeerConfig::deserialize_custom_image_quality",
skip_serializing_if = "Vec::is_empty"
)]
pub custom_image_quality: Vec<i32>,
#[serde(flatten)]
@ -244,7 +251,11 @@ pub struct PeerConfig {
pub enable_file_transfer: EnableFileTransfer,
#[serde(flatten)]
pub show_quality_monitor: ShowQualityMonitor,
#[serde(default, deserialize_with = "deserialize_string")]
#[serde(
default,
deserialize_with = "deserialize_string",
skip_serializing_if = "String::is_empty"
)]
pub keyboard_mode: String,
#[serde(flatten)]
pub view_only: ViewOnly,