From d8fe75860465a09fc5b80143069a7cd719cafb2f Mon Sep 17 00:00:00 2001
From: fufesou <shuanglongchen@yeah.net>
Date: Wed, 15 Feb 2023 21:27:50 +0800
Subject: [PATCH] set event stream to None in rust side

Signed-off-by: fufesou <shuanglongchen@yeah.net>
---
 flutter/lib/models/model.dart | 1 +
 src/flutter.rs                | 8 ++++++++
 src/flutter_ffi.rs            | 9 +++------
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/flutter/lib/models/model.dart b/flutter/lib/models/model.dart
index 865a8bea6..39b1cdd03 100644
--- a/flutter/lib/models/model.dart
+++ b/flutter/lib/models/model.dart
@@ -1389,6 +1389,7 @@ class FFI {
           }
         }
       }
+      debugPrint('Exit session event loop');
     }();
     // every instance will bind a stream
     this.id = id;
diff --git a/src/flutter.rs b/src/flutter.rs
index a60e379f9..d0f397d3f 100644
--- a/src/flutter.rs
+++ b/src/flutter.rs
@@ -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 {
diff --git a/src/flutter_ffi.rs b/src/flutter_ffi.rs
index 3f9940854..53ddb724a 100644
--- a/src/flutter_ffi.rs
+++ b/src/flutter_ffi.rs
@@ -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) {