From a6d41f9c77b1e6732c93c0f8fece1093e886d64a Mon Sep 17 00:00:00 2001
From: ggurdin <ggurdin@gmail.com>
Date: Tue, 22 Oct 2024 09:36:55 -0400
Subject: [PATCH] check if mounted before clearing selected events, clear
 selected events on dispose

---
 lib/pages/chat/chat.dart | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index a51a86b37..d5cb30747 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -560,6 +560,7 @@ class ChatController extends State<ChatPageWithRoom>
     //#Pangea
     choreographer.stateListener.close();
     choreographer.dispose();
+    clearSelectedEvents();
     MatrixState.pAnyState.closeOverlay();
     //Pangea#
     super.dispose();
@@ -1334,13 +1335,18 @@ class ChatController extends State<ChatPageWithRoom>
   }
   // Pangea#
 
-  void clearSelectedEvents() => setState(() {
-        // #Pangea
-        closeSelectionOverlay();
-        // Pangea#
-        selectedEvents.clear();
-        showEmojiPicker = false;
-      });
+  void clearSelectedEvents() {
+    // #Pangea
+    if (!mounted) return;
+    // Pangea#
+    setState(() {
+      // #Pangea
+      closeSelectionOverlay();
+      // Pangea#
+      selectedEvents.clear();
+      showEmojiPicker = false;
+    });
+  }
 
   void clearSingleSelectedEvent() {
     if (selectedEvents.length <= 1) {