From 119a7fe7f47c0fe99f4b1bbc1c145329d0446c1f Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 21 Sep 2016 15:02:19 +0200
Subject: [PATCH] Improved destruction of LinphoneCore when device shuts down

---
 src/org/linphone/BootReceiver.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/org/linphone/BootReceiver.java b/src/org/linphone/BootReceiver.java
index 307a56521..5771e2775 100644
--- a/src/org/linphone/BootReceiver.java
+++ b/src/org/linphone/BootReceiver.java
@@ -18,7 +18,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 package org.linphone;
 
-import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LpConfig;
 import org.linphone.mediastream.Log;
@@ -32,11 +31,8 @@ public class BootReceiver extends BroadcastReceiver {
 	@Override
 	public void onReceive(Context context, Intent intent) {
 		if (intent.getAction().equalsIgnoreCase(Intent.ACTION_SHUTDOWN)) {
-			LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
-			if (lc != null) {
-				Log.w("Device is shutting down, destroying LinphoneCore to unregister");
-				lc.destroy();
-			}
+			Log.w("Device is shutting down, destroying LinphoneCore to unregister");
+			LinphoneManager.destroy();
 		} else {
 			String path = context.getFilesDir().getAbsolutePath() + "/.linphonerc";
 			LpConfig lpConfig = LinphoneCoreFactory.instance().createLpConfig(path);