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

Merge pull request #3224 from fufesou/fix/close_session_flutter

Browse Source 
set event stream to None in rust side
This commit is contained in:
RustDesk 2023-02-15 21:37:50 +08:00 committed by GitHub
commit 1b3ad55f9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flutter/lib/models/model.dart
View File

@ -1389,6 +1389,7 @@ class FFI {
}
}
}
debugPrint('Exit session event loop');
}();
// every instance will bind a stream
this.id = id;

8
src/flutter.rs
View File

@ -134,6 +134,14 @@ impl FlutterHandler {
stream.add(EventToUI::Event(out));
}
}
pub fn close_event_stream(&mut self) {
let mut stream_lock = self.event_stream.write().unwrap();
if let Some(stream) = &*stream_lock {
stream.add(EventToUI::Event("close".to_owned()));
}
*stream_lock = None;
}
}
impl InvokeUiSession for FlutterHandler {

9
src/flutter_ffi.rs
View File

@ -6,7 +6,7 @@ use crate::{
flutter::{session_add, session_start_},
ui_interface::{self, *},
};
use flutter_rust_bridge::{StreamSink, SyncReturn, ZeroCopyBuffer};
use flutter_rust_bridge::{StreamSink, SyncReturn};
use hbb_common::{
config::{self, LocalConfig, PeerConfig, ONLINE},
fs, log,
@ -131,13 +131,10 @@ pub fn session_login(id: String, password: String, remember: bool) {
}
pub fn session_close(id: String) {
if let Some(session) = SESSIONS.read().unwrap().get(&id) {
if let Some(stream) = &*session.event_stream.read().unwrap() {
stream.add(EventToUI::Event("close".to_owned()));
}
if let Some(mut session) = SESSIONS.write().unwrap().remove(&id) {
session.close_event_stream();
session.close();
}
let _ = SESSIONS.write().unwrap().remove(&id);
}
pub fn session_refresh(id: String) {