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

fix view mode

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages
2023-03-17 11:27:22 +08:00
parent 450a9cdb35
commit 774694714d
8 changed files with 103 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,10 +235,12 @@ pub struct PeerConfig {
pub show_quality_monitor: ShowQualityMonitor,
#[serde(default)]
pub keyboard_mode: String,
#[serde(flatten)]
pub view_only: ViewOnly,
// The other scalar value must before this
#[serde(default, deserialize_with = "PeerConfig::deserialize_options")]
pub options: HashMap<String, String>,
pub options: HashMap<String, String>, // not use delete to represent default values
// Various data for flutter ui
#[serde(default)]
pub ui_flutter: HashMap<String, String>,
@@ -1061,10 +1063,6 @@ impl PeerConfig {
if !mp.contains_key(key) {
mp.insert(key.to_owned(), UserDefaultConfig::read().get(key));
}
key = "view-only";
if !mp.contains_key(key) {
mp.insert(key.to_owned(), UserDefaultConfig::read().get(key));
}
Ok(mp)
}
}
@@ -1119,6 +1117,13 @@ serde_field_bool!(
"AllowSwapKey::default_allow_swap_key"
);
serde_field_bool!(
ViewOnly,
"view_only",
default_view_only,
"ViewOnly::default_view_only"
);
#[derive(Debug, Default, Serialize, Deserialize, Clone)]
pub struct LocalConfig {
#[serde(default)]
@@ -1415,7 +1420,8 @@ impl ConfigOidc {
if let Ok(client_id) = env::var(format!("OIDC-{}-CLIENT-ID", k.to_uppercase())) {
v.client_id = client_id;
}
if let Ok(client_secret) = env::var(format!("OIDC-{}-CLIENT-SECRET", k.to_uppercase())) {
if let Ok(client_secret) = env::var(format!("OIDC-{}-CLIENT-SECRET", k.to_uppercase()))
{
v.client_secret = client_secret;
}
}