From 6f07eed8ed025aeea04ed50fb54fdbe26042179e Mon Sep 17 00:00:00 2001
From: Kelrap <kel.raphael3@outlook.com>
Date: Wed, 31 Jul 2024 13:03:19 -0400
Subject: [PATCH] Fix more closure fails

---
 lib/pages/chat/chat.dart | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index 93e7f80ec..c4abcbac2 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -986,6 +986,9 @@ class ChatController extends State<ChatPageWithRoom>
   }
 
   void redactEventsAction() async {
+    // #Pangea
+    MatrixState.pAnyState.closeOverlay();
+    // Pangea#
     final reasonInput = selectedEvents.any((event) => event.status.isSent)
         ? await showTextInputDialog(
             context: context,
@@ -1001,7 +1004,12 @@ class ChatController extends State<ChatPageWithRoom>
             cancelLabel: L10n.of(context)!.cancel,
           )
         : <String>[];
-    if (reasonInput == null) return;
+    if (reasonInput == null) {
+      // #Pangea
+      clearSelectedEvents();
+      // Pangea#
+      return;
+    }
     final reason = reasonInput.single.isEmpty ? null : reasonInput.single;
     for (final event in selectedEvents) {
       await showFutureLoadingDialog(
@@ -1076,10 +1084,10 @@ class ChatController extends State<ChatPageWithRoom>
   }
 
   void forwardEventsAction() async {
+    // #Pangea
+    MatrixState.pAnyState.closeOverlay();
+    // Pangea#
     if (selectedEvents.length == 1) {
-      // #Pangea
-      MatrixState.pAnyState.closeOverlay();
-      // Pangea#
       Matrix.of(context).shareContent =
           selectedEvents.first.getDisplayEvent(timeline!).content;
     } else {