From 8b2dc22fe1c8db994818c399dcb04912a04fc18c Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Wed, 14 Apr 2021 09:37:06 +0100
Subject: [PATCH] fix closing modal when finished

---
 src/components/views/dialogs/InviteDialog.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
index cbdfdcbdc8..c89e61bd18 100644
--- a/src/components/views/dialogs/InviteDialog.tsx
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -656,6 +656,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
 
         // Check if it's a traditional DM and create the room if required.
         // TODO: [Canonical DMs] Remove this check and instead just create the multi-person DM
+        let abort = false;
         try {
             const isSelf = targetIds.length === 1 && targetIds[0] === client.getUserId();
             if (targetIds.length === 1 && !isSelf) {
@@ -673,9 +674,10 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
                 await client.peekInRoom(roomId);
                 const invitesState = await inviteMultipleToRoom(roomId, targetIds);
 
-                if (!this._shouldAbortAfterInviteError(invitesState)) {
-                    this.props.onFinished();
-                }
+                abort = this._shouldAbortAfterInviteError(invitesState);
+            }
+            if (!abort) {
+                this.props.onFinished();
             }
         } catch (err) {
             console.error(err);