From 8cb4bb45173ba270716334fd3f913986f5819616 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 18 Jan 2016 17:39:03 +0100 Subject: [PATCH] make sure single video activity is created --- src/org/linphone/CallOutgoingActivity.java | 4 +++- submodules/linphone | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/org/linphone/CallOutgoingActivity.java b/src/org/linphone/CallOutgoingActivity.java index 0b8d981cd..4d20037ff 100644 --- a/src/org/linphone/CallOutgoingActivity.java +++ b/src/org/linphone/CallOutgoingActivity.java @@ -97,7 +97,7 @@ public class CallOutgoingActivity extends Activity implements OnClickListener{ finish(); } - if (call == mCall && State.Connected == state || State.StreamsRunning == state){ + if (call == mCall && State.StreamsRunning == state){ if (!LinphoneActivity.isInstanciated()) { return; } @@ -107,6 +107,8 @@ public class CallOutgoingActivity extends Activity implements OnClickListener{ } else { LinphoneActivity.instance().startIncallActivity(mCall); } + finish(); + } } }; diff --git a/submodules/linphone b/submodules/linphone index fcadf804e..67f9bd206 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit fcadf804ebd4963e76be83cfa52a391fdc617f90 +Subproject commit 67f9bd2068ab6d040ddadd4209a538aef99a893a