From cb08478146949c4ea2e6cd1b76bfe4d32e1e3cd5 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Thu, 5 Apr 2012 11:48:30 +0200
Subject: [PATCH] Fix resume issue

---
 src/org/linphone/DialerActivity.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index b00791bb6..ab8480c05 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -309,7 +309,8 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
 			        }
 			        
 			        mVideoCaptureViewReady.requestLayout();
-			        mCamera.startPreview();
+			        if (mCamera != null)
+			        	mCamera.startPreview();
 				}
 				
 			});
@@ -488,7 +489,7 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
         
 		super.onResume();
 		
-		if (mVideoCaptureViewReady != null && mCamera == null)
+		if (mVideoCaptureViewReady != null && mCamera == null && !LinphoneManager.getLc().isIncall())
 		{
 			mCamera = Camera.open(mCurrentCameraId);
 			mVideoCaptureViewReady.requestLayout();