From 9cf50d3c06181b245e2901d94c7471ff2a4139c7 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 30 Jan 2023 15:22:29 +0100
Subject: [PATCH] Trying to prevent crash when CallActivity is destroyed after
 the Core

---
 .../main/java/org/linphone/activities/voip/CallActivity.kt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/voip/CallActivity.kt b/app/src/main/java/org/linphone/activities/voip/CallActivity.kt
index 89dd7bf07..fa6482ae4 100644
--- a/app/src/main/java/org/linphone/activities/voip/CallActivity.kt
+++ b/app/src/main/java/org/linphone/activities/voip/CallActivity.kt
@@ -41,6 +41,7 @@ import org.linphone.activities.voip.viewmodels.ControlsViewModel
 import org.linphone.activities.voip.viewmodels.StatisticsListViewModel
 import org.linphone.compatibility.Compatibility
 import org.linphone.core.Call
+import org.linphone.core.GlobalState
 import org.linphone.core.tools.Log
 import org.linphone.databinding.VoipActivityBinding
 import org.linphone.mediastream.Version
@@ -240,8 +241,10 @@ class CallActivity : ProximitySensorActivity() {
     }
 
     override fun onDestroy() {
-        coreContext.core.nativeVideoWindowId = null
-        coreContext.core.nativePreviewWindowId = null
+        if (coreContext.core.globalState != GlobalState.Off) {
+            coreContext.core.nativeVideoWindowId = null
+            coreContext.core.nativePreviewWindowId = null
+        }
 
         super.onDestroy()
     }