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

Merge branch 'rustdesk/master'

Browse Source
This commit is contained in:
Asura
2022-08-27 09:55:27 +08:00
parent ba17864fa1 ba8addbe2f
commit e0db94532f
156 changed files with 20300 additions and 3415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/connection.rs
View File

@@ -5,8 +5,8 @@ use crate::clipboard_file::*;
use crate::common::update_clipboard;
use crate::video_service;
#[cfg(any(target_os = "android", target_os = "ios"))]
use crate::{common::MOBILE_INFO2, mobile::connection_manager::start_channel};
use crate::{ipc};
use crate::{common::DEVICE_NAME, flutter::connection_manager::start_channel};
use crate::{ipc, VERSION};
use hbb_common::{
config::Config,
fs,
@@ -644,7 +644,7 @@ impl Connection {
}
#[cfg(target_os = "android")]
{
pi.hostname = MOBILE_INFO2.lock().unwrap().clone();
pi.hostname = DEVICE_NAME.lock().unwrap().clone();
pi.platform = "Android".into();
}
#[cfg(feature = "hwcodec")]