From 6632322029b467109388f6e71374664d4c5c2401 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 3 Aug 2016 19:56:04 +0100
Subject: [PATCH] spell out that conference calling is hit and miss

---
 src/CallHandler.js | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 5bd2d20ae8..9118ee1973 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -250,12 +250,24 @@ function _onAction(payload) {
                 });
             }
             else {
-                ConferenceHandler.createNewMatrixCall(
-                    MatrixClientPeg.get(), payload.room_id
-                ).done(function(call) {
-                    placeCall(call);
-                }, function(err) {
-                    console.error("Failed to setup conference call: %s", err);
+                var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+                Modal.createDialog(QuestionDialog, {
+                    title: "Warning!",
+                    description: "Conference calling in Vector is in development and may not be reliable.",
+                    onFinished: confirm=>{
+                        if (confirm) {
+                            ConferenceHandler.createNewMatrixCall(
+                                MatrixClientPeg.get(), payload.room_id
+                            ).done(function(call) {
+                                placeCall(call);
+                            }, function(err) {
+                                Modal.createDialog(ErrorDialog, {
+                                    title: "Failed to set up conference call",
+                                    description: "Conference call failed: " + err,
+                                });
+                            });
+                        }
+                    },
                 });
             }
             break;