From 99a5d7714ea49883066adfdd7d8c251e351f4848 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 17 Feb 2015 16:50:24 +0100
Subject: [PATCH] Activate video button when mediaInProgress is false

---
 src/org/linphone/InCallActivity.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java
index 3844c59e8..fd1135115 100644
--- a/src/org/linphone/InCallActivity.java
+++ b/src/org/linphone/InCallActivity.java
@@ -131,10 +131,6 @@ public class InCallActivity extends FragmentActivity implements OnClickListener
         			return;
         		}
         		
-        		if(!LinphonePreferences.instance().isVideoEnabled()){
-        			video.setEnabled(true);
-        		}
-        		
         		if (state == State.IncomingReceived) {
         			startIncomingCallActivity();
         			return;
@@ -155,10 +151,15 @@ public class InCallActivity extends FragmentActivity implements OnClickListener
         				}
         			}
         		}
-        		
+
         		if (state == State.StreamsRunning) {
         			switchVideo(isVideoEnabled(call));
 
+					//Check media in progress
+					if(LinphonePreferences.instance().isVideoEnabled() && !call.mediaInProgress()){
+						video.setEnabled(true);
+					}
+
         			LinphoneManager.getLc().enableSpeaker(isSpeakerEnabled);
 
         			isMicMuted = LinphoneManager.getLc().isMicMuted();
@@ -432,7 +433,7 @@ public class InCallActivity extends FragmentActivity implements OnClickListener
 		transfer.setEnabled(getResources().getBoolean(R.bool.allow_transfers));
 		options.setEnabled(!getResources().getBoolean(R.bool.disable_options_in_call) && (addCall.isEnabled() || transfer.isEnabled()));
 		
-		video.setEnabled(true);
+		//video.setEnabled(true);
 		micro.setEnabled(true);
 		if(!isTablet()){
 			speaker.setEnabled(true);