From 02289a9c762a74d7d33ec0680ba3eb280d1512c0 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Fri, 25 Feb 2022 19:38:02 +0100
Subject: [PATCH] feat: correct another issue with state holder api
---
.../libquassel/protocol/util/StateHolderExtensions.kt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/StateHolderExtensions.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/StateHolderExtensions.kt
index 5be2326..c2b466b 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/StateHolderExtensions.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/StateHolderExtensions.kt
@@ -22,4 +22,7 @@ inline fun <T> Flow<StateHolder<T>?>.flatMap(): Flow<T?> =
@ExperimentalCoroutinesApi
inline fun <reified T> Flow<Iterable<StateHolder<T>>?>.combineLatest(): Flow<List<T>> =
- flatMapLatest { combine(it?.map(StateHolder<T>::flow).orEmpty(), ::listOf) }
+ flatMapLatest {
+ if (it != null) combine(it.map(StateHolder<T>::flow), ::listOf)
+ else flowOf(emptyList())
+ }
--
GitLab