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

change to rustdesk/rdev and remove warn

Browse Source
This commit is contained in:
rustdesk 2022-12-08 20:08:33 +08:00
parent fa3618f406
commit 22d071d2ef
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Cargo.lock generated
View File

@ -1533,7 +1533,7 @@ dependencies = [
"log", "log",
"objc", "objc",
"pkg-config", "pkg-config",
"rdev", "rdev 0.5.0-2 (git+https://github.com/asur4s/rdev)",
"serde 1.0.147", "serde 1.0.147",
"serde_derive", "serde_derive",
"tfc", "tfc",
@ -4248,6 +4248,28 @@ dependencies = [
"x11 2.20.0", "x11 2.20.0",
] ]
[[package]]
name = "rdev"
version = "0.5.0-2"
source = "git+https://github.com/rustdesk/rdev#25c29f61bfdf5d8ec50f0a8a7743bc1d85eb2c04"
dependencies = [
"cocoa",
"core-foundation 0.9.3",
"core-foundation-sys 0.8.3",
"core-graphics 0.22.3",
"enum-map",
"epoll",
"inotify",
"lazy_static",
"libc",
"mio 0.8.5",
"strum 0.24.1",
"strum_macros 0.24.3",
"widestring 1.0.2",
"winapi 0.3.9",
"x11 2.20.0",
]
[[package]] [[package]]
name = "rdrand" name = "rdrand"
version = "0.4.0" version = "0.4.0"
@ -4518,7 +4540,7 @@ dependencies = [
"num_cpus", "num_cpus",
"objc", "objc",
"parity-tokio-ipc", "parity-tokio-ipc",
"rdev", "rdev 0.5.0-2 (git+https://github.com/rustdesk/rdev)",
"repng", "repng",
"reqwest", "reqwest",
"rpassword 7.1.0", "rpassword 7.1.0",

2
src/client/io_loop.rs
View File

@ -936,7 +936,7 @@ impl<T: InvokeUiSession> Remote<T> {
self.handle_job_status(d.id, d.file_num, err); self.handle_job_status(d.id, d.file_num, err);
} }
Some(file_response::Union::Error(e)) => { Some(file_response::Union::Error(e)) => {
if let Some(job) = fs::get_job(e.id, &mut self.write_jobs) { if let Some(_job) = fs::get_job(e.id, &mut self.write_jobs) {
fs::remove_job(e.id, &mut self.write_jobs); fs::remove_job(e.id, &mut self.write_jobs);
} }
self.handle_job_status(e.id, e.file_num, Some(e.error)); self.handle_job_status(e.id, e.file_num, Some(e.error));

3
src/server/video_service.rs
View File

@ -21,8 +21,9 @@
use super::{video_qos::VideoQoS, *}; use super::{video_qos::VideoQoS, *};
#[cfg(windows)] #[cfg(windows)]
use crate::portable_service::client::PORTABLE_SERVICE_RUNNING; use crate::portable_service::client::PORTABLE_SERVICE_RUNNING;
#[cfg(windows)]
use hbb_common::get_version_number;
use hbb_common::{ use hbb_common::{
get_version_number,
tokio::sync::{ tokio::sync::{
mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender}, mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender},
Mutex as TokioMutex, Mutex as TokioMutex,