From ae6747dbd5b4cc58076273e540676762bc5f8afc Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 21 Oct 2011 14:19:55 +0200
Subject: [PATCH] Fix EC/EL and conferencing.

---
 src/org/linphone/LinphoneManager.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 65e475e36..53c64e4ea 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -236,13 +236,13 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	public void routeAudioToSpeaker(boolean isUserRequest) {
 		if (isUserRequest) sUserRequestedSpeaker = true;
 		routeAudioToSpeakerHelper(true);
-		if (mLc.isIncall()) {
+		LinphoneCall currentCall = mLc.getCurrentCall();
+		if (currentCall != null) {
 			/*disable EC, it is not efficient enough on speaker mode due to bad quality of speakers and saturation*/  
-			mLc.getCurrentCall().enableEchoCancellation(false);
+			currentCall.enableEchoCancellation(false);
 			/* instead we prefer the echo limiter */
-			mLc.getCurrentCall().enableEchoLimiter(true);
+			currentCall.enableEchoLimiter(true);
 		}
-		
 	}
 
 	/**