Merge pull request #7692 from vector-im/alfogrillo/fix-rte-crash

Fix new dm crash with RTE is enabled
element-hq · Oct 4, 2023 · 7010a69 · 7010a69
2 parents 0c5e3df + df21fa7
commit 7010a69
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
@@ -3121,15 +3121,16 @@ - (void)displayRoomPreview:(RoomPreviewData *)previewData
 
 - (void)displayNewDirectChatWithTargetUser:(nonnull MXUser*)directChatTargetUser session:(nonnull MXSession*)session
 {
+    // `[displayRoom:]` may require the session, setting it here before calling it
+    [self addMatrixSession:session];
+
     // Release existing room data source or preview
     [self displayRoom:nil];
 
     self.directChatTargetUser = directChatTargetUser;
 
     self.eventsAcknowledgementEnabled = NO;
-
-    [self addMatrixSession:session];
-
+
     [self refreshRoomTitle];
     [self refreshRoomInputToolbar];
 }