feat: correct issue with state holder api

build.gradle.kts

@@ -15,4 +15,4 @@ plugins {
 }
 
 group = "de.justjanne.libquassel"
-version = "0.8.0"
+version = "0.8.1"

libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/StateHolderExtensions.kt

@@ -12,14 +12,17 @@ package de.justjanne.libquassel.protocol.util
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
 
 @ExperimentalCoroutinesApi
 @Suppress("NOTHING_TO_INLINE")
 inline fun <T> Flow<StateHolder<T>?>.flatMap(): Flow<T?> =
-  flatMapLatest { it?.flow() ?: emptyFlow() }
+  flatMapLatest { it?.flow() ?: flowOf(null) }
 
 @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())
+  }