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 default keyboard mode when changing version

Browse Source
This commit is contained in:
Asur4s
2023-01-11 23:38:05 +08:00
parent a3769ca8e9
commit 3102a24166
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/client.rs
View File

@@ -7,6 +7,7 @@ use cpal::{
use magnum_opus::{Channels::*, Decoder as AudioDecoder};
use sha2::{Digest, Sha256};
use std::{
str::FromStr,
collections::HashMap,
net::SocketAddr,
ops::{Deref, Not},
@@ -48,7 +49,7 @@ pub mod file_trait;
pub mod helper;
pub mod io_loop;
use crate::{
common::is_keyboard_mode_supported,
common::{self, is_keyboard_mode_supported},
server::video_service::{SCRAP_X11_REF_URL, SCRAP_X11_REQUIRED},
};
pub static SERVER_KEYBOARD_ENABLED: AtomicBool = AtomicBool::new(true);
@@ -1419,6 +1420,13 @@ impl LoginConfigHandler {
} else {
config.keyboard_mode = KeyboardMode::Legacy.to_string();
}
} else {
let keyboard_modes =
common::get_supported_keyboard_modes(get_version_number(&pi.version));
let current_mode = &KeyboardMode::from_str(&config.keyboard_mode).unwrap_or_default();
if !keyboard_modes.contains(current_mode) {
config.keyboard_mode = KeyboardMode::Legacy.to_string();
}
}
self.conn_id = pi.conn_id;
// no matter if change, for update file time