Merge pull request #7237 from vector-im/nimau/7232_crash_new_dm_creation

fixed a crash when a new DM room is created (#7232)
element-hq · Jan 6, 2023 · f7e3962 · f7e3962
2 parents 7cd73e1 + 3561b41
commit f7e3962
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
@@ -1064,6 +1064,9 @@ - (void)displayRoom:(MXKRoomDataSource *)dataSource
 
         // Set room title view
         [self refreshRoomTitle];
+
+        // Stop any pending voice broadcast if needed
+        [self stopUncompletedVoiceBroadcastIfNeeded];
     }
     else
     {
@@ -1082,8 +1085,6 @@ - (void)displayRoom:(MXKRoomDataSource *)dataSource
     [self setupUserSuggestionViewIfNeeded];
 
     [self updateTopBanners];
-
-    [self stopUncompletedVoiceBroadcastIfNeeded];
 }
 
 - (void)onRoomDataSourceReady

diff --git a/Riot/Modules/Room/RoomViewController.swift b/Riot/Modules/Room/RoomViewController.swift
@@ -320,6 +320,6 @@ extension RoomViewController: ComposerLinkActionBridgePresenterDelegate {
 // MARK: - VoiceBroadcast
 extension RoomViewController {
     @objc func stopUncompletedVoiceBroadcastIfNeeded() {
-        self.roomDataSource.room.stopUncompletedVoiceBroadcastIfNeeded()
+        self.roomDataSource?.room.stopUncompletedVoiceBroadcastIfNeeded()
     }
 }
diff --git a/changelog.d/7232.bugfix b/changelog.d/7232.bugfix
@@ -0,0 +1 @@
+ Direct Message: fixed a crash when a new DM room is created
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Direct Message: fixed a crash when a new DM room is created