hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5788 from 21pages/fix

Browse Source 
fix file transfer affect codec selection
This commit is contained in:
RustDesk 2023-09-23 23:45:17 +08:00 committed by GitHub
commit 2080e56f87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/connection.rs
View File

@ -1330,10 +1330,8 @@ impl Connection {
return Config::get_option(enable_prefix_option).is_empty(); return Config::get_option(enable_prefix_option).is_empty();
} }
async fn handle_login_request_without_validation(&mut self, lr: &LoginRequest) { fn update_codec_on_login(&self, lr: &LoginRequest) {
self.lr = lr.clone();
if let Some(o) = lr.option.as_ref() { if let Some(o) = lr.option.as_ref() {
self.options_in_login = Some(o.clone());
if let Some(q) = o.supported_decoding.clone().take() { if let Some(q) = o.supported_decoding.clone().take() {
scrap::codec::Encoder::update( scrap::codec::Encoder::update(
self.inner.id(), self.inner.id(),
@ -1351,6 +1349,16 @@ impl Connection {
scrap::codec::EncodingUpdate::NewOnlyVP9, scrap::codec::EncodingUpdate::NewOnlyVP9,
); );
} }
}
async fn handle_login_request_without_validation(&mut self, lr: &LoginRequest) {
self.lr = lr.clone();
if let Some(o) = lr.option.as_ref() {
self.options_in_login = Some(o.clone());
}
if lr.union.is_none() {
self.update_codec_on_login(&lr);
}
self.video_ack_required = lr.video_ack_required; self.video_ack_required = lr.video_ack_required;
} }