From 8c8f15b02d62b033a525640e6a51c5560d41f8be Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Sat, 17 Aug 2024 13:58:25 +0200 Subject: [PATCH] Prevent crash due to un-initialized property --- .../ui/call/viewmodel/CurrentCallViewModel.kt | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt index da1ed8d73..3e14ba588 100644 --- a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt +++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt @@ -652,17 +652,19 @@ class CurrentCallViewModel @UiThread constructor() : GenericViewModel() { @UiThread fun refreshMicrophoneState() { coreContext.postOnCoreThread { - val micMuted = if (currentCall.conference != null) { - currentCall.conference?.microphoneMuted ?: false - } else { - currentCall.microphoneMuted + if (::currentCall.isInitialized) { + val micMuted = if (currentCall.conference != null) { + currentCall.conference?.microphoneMuted ?: false + } else { + currentCall.microphoneMuted + } + if (currentCall.conference != null) { + currentCall.conference?.microphoneMuted = !micMuted + } else { + currentCall.microphoneMuted = !micMuted + } + isMicrophoneMuted.postValue(micMuted) } - if (currentCall.conference != null) { - currentCall.conference?.microphoneMuted = !micMuted - } else { - currentCall.microphoneMuted = !micMuted - } - isMicrophoneMuted.postValue(micMuted) } }