From 414881eb56d63a936650f8773b862f48e2da6ff8 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 11 Sep 2022 16:43:34 +0200
Subject: [PATCH] [merge] Fix mismerge causing spaceless launch to not load any
 rooms

Change-Id: Idde4f17babde5522e853c0f0bd7fdba2ed6f946d
---
 vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt b/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
index 32b23f8e59..ab1048da33 100644
--- a/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
+++ b/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
@@ -97,9 +97,10 @@ class SpaceStateHandlerImpl @Inject constructor(
             from: SelectSpaceFrom,
     ) {
         val activeSession = session ?: activeSessionHolder.getSafeActiveSession() ?: return
-        val spaceToLeave = selectedSpaceDataSourceSc.currentValue?.orNull()?.first
+        val currentValue = selectedSpaceDataSourceSc.currentValue?.orNull()
+        val spaceToLeave = currentValue?.first
         val spaceToSet = spaceId?.let { activeSession.getRoomSummary(spaceId) }
-        val sameSpaceSelected = spaceId == spaceToLeave?.roomId
+        val sameSpaceSelected = currentValue != null && spaceId == spaceToLeave?.roomId
 
         if (sameSpaceSelected) {
             return