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

fix cm crash

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2022-11-04 18:14:47 +08:00
parent 627ccd4c01
commit ea238337c4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ui_cm_interface.rs
View File

@ -57,6 +57,7 @@ struct IpcTaskRunner<T: InvokeUiCM> {
tx: mpsc::UnboundedSender<Data>, tx: mpsc::UnboundedSender<Data>,
rx: mpsc::UnboundedReceiver<Data>, rx: mpsc::UnboundedReceiver<Data>,
close: bool, close: bool,
running: bool,
conn_id: i32, conn_id: i32,
#[cfg(windows)] #[cfg(windows)]
file_transfer_enabled: bool, file_transfer_enabled: bool,
@ -218,6 +219,7 @@ pub fn switch_permission(id: i32, name: String, enabled: bool) {
}; };
} }
#[cfg(any(target_os = "android", target_os = "ios", feature = "flutter"))]
#[inline] #[inline]
pub fn get_clients_state() -> String { pub fn get_clients_state() -> String {
let clients = CLIENTS.read().unwrap(); let clients = CLIENTS.read().unwrap();
@ -287,6 +289,7 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
(_tx_clip, rx_clip) = unbounded_channel::<i32>(); (_tx_clip, rx_clip) = unbounded_channel::<i32>();
} }
self.running = false;
loop { loop {
tokio::select! { tokio::select! {
res = self.stream.next() => { res = self.stream.next() => {
@ -305,6 +308,7 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
{ {
self.file_transfer_enabled = _file_transfer_enabled; self.file_transfer_enabled = _file_transfer_enabled;
} }
self.running = true;
break; break;
} }
Data::Close => { Data::Close => {
@ -389,13 +393,13 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
tx, tx,
rx, rx,
close: true, close: true,
running: true,
conn_id: 0, conn_id: 0,
#[cfg(windows)] #[cfg(windows)]
file_transfer_enabled: false, file_transfer_enabled: false,
}; };
task_runner.run().await; while task_runner.running {
if task_runner.conn_id > 0 {
task_runner.run().await; task_runner.run().await;
} }
if task_runner.conn_id > 0 { if task_runner.conn_id > 0 {