From 9280c8ea8e2a5e1eccee32346f60bca3a6274ff4 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Thu, 27 Oct 2011 11:53:31 +0200
Subject: [PATCH] Fix bad commit "Don't try to add empty call".

---
 src/org/linphone/ConferenceActivity.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 406e821af..1ed88d39b 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -873,7 +873,10 @@ public class ConferenceActivity extends ListActivity implements
 			((ToggleButton) findViewById(R.id.toggleMuteMic)).setChecked(false);
 		}
 
-		String uri = data.getStringExtra(UriPickerActivity.EXTRA_CALLEE_URI);
+		String uri = null;
+		if (data != null) {
+			uri = data.getStringExtra(UriPickerActivity.EXTRA_CALLEE_URI);
+		}
 		if (resultCode != RESULT_OK || TextUtils.isEmpty(uri)) {
 			callToTransfer = null;
 			Toast.makeText(this, R.string.uri_picking_canceled, Toast.LENGTH_LONG).show();