From badea87d7cdf1d3393e7035ea17f998bff7a0dc4 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Wed, 5 Apr 2023 17:37:09 +0200
Subject: [PATCH] Cancel start DM if there is no more selected user

---
 .../features/createroom/impl/root/CreateRoomRootView.kt    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
index 61b8b8738e..e488645b78 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
@@ -113,9 +113,10 @@ fun CreateRoomRootView(
                 content = stringResource(id = StringR.string.screen_start_chat_error_starting_chat),
                 onDismiss = { state.eventSink(CreateRoomRootEvents.CancelStartDM) },
                 onRetry = {
-                    state.userListState.selectedUsers.firstOrNull()?.let {
-                        state.eventSink(CreateRoomRootEvents.StartDM(it))
-                    }
+                    state.userListState.selectedUsers.firstOrNull()
+                        ?.let { state.eventSink(CreateRoomRootEvents.StartDM(it)) }
+                    // Cancel start DM if there is no more selected user (should not happen)
+                        ?: state.eventSink(CreateRoomRootEvents.CancelStartDM)
                 },
             )
         }