From b58fbb26ba670f05aa763bccd29ed8c80db4677b Mon Sep 17 00:00:00 2001
From: 21pages <pages21@163.com>
Date: Mon, 29 May 2023 09:46:16 +0800
Subject: [PATCH] close chat page bofore remote page

Signed-off-by: 21pages <pages21@163.com>
---
 flutter/lib/common.dart            | 1 +
 flutter/lib/models/chat_model.dart | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index 544dabaf7..bd5005ffa 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -526,6 +526,7 @@ String formatDurationToTime(Duration duration) {
 
 closeConnection({String? id}) {
   if (isAndroid || isIOS) {
+    gFFI.chatModel.hideChatOverlay();
     Navigator.popUntil(globalKey.currentContext!, ModalRoute.withName("/"));
   } else {
     final controller = Get.find<DesktopTabController>();
diff --git a/flutter/lib/models/chat_model.dart b/flutter/lib/models/chat_model.dart
index ae8689dbb..21ffc1eef 100644
--- a/flutter/lib/models/chat_model.dart
+++ b/flutter/lib/models/chat_model.dart
@@ -7,7 +7,7 @@ import 'package:flutter_hbb/models/platform_model.dart';
 import 'package:get/get_rx/src/rx_types/rx_types.dart';
 import 'package:get/get.dart';
 import 'package:window_manager/window_manager.dart';
- import 'package:flutter_svg/flutter_svg.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 
 import '../consts.dart';
 import '../common.dart';
@@ -185,6 +185,13 @@ class ChatModel with ChangeNotifier {
     }
   }
 
+  hideChatOverlay() {
+    if (!_isChatOverlayHide()) {
+      hideChatIconOverlay();
+      hideChatWindowOverlay();
+    }
+  }
+
   showChatPage(int id) async {
     if (isConnManager) {
       if (!_isShowCMChatPage) {