From 0ced595b883c9593aec333d18cf601447f63a581 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Date: Thu, 13 Oct 2011 11:58:28 +0200
Subject: [PATCH] Do not apply new settings during a call

---
 src/org/linphone/LinphonePreferencesActivity.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/org/linphone/LinphonePreferencesActivity.java b/src/org/linphone/LinphonePreferencesActivity.java
index f69baa1b9..1745b3404 100644
--- a/src/org/linphone/LinphonePreferencesActivity.java
+++ b/src/org/linphone/LinphonePreferencesActivity.java
@@ -32,6 +32,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.linphone.LinphoneManager.EcCalibrationListener;
+import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.Log;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
@@ -229,6 +230,12 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements E
 
 		if (!isFinishing()) return;
 
+		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
+		
+		if (lc != null && (lc.isInComingInvitePending() || lc.isIncall())) {
+			Log.w("Call in progress => settings not applied");
+			return;
+		}
 
 		try {
 			LinphoneManager.getInstance().initFromConf(getApplicationContext());