Merge pull request #98 from jaoo/1053338

Bug 1053338 - [B2G][Loop] Calling a third user while in a call prevents users from closing Loop app. r=borjasalguero
mozilla-b2g · Aug 26, 2014 · 194799d · 194799d
2 parents 4097cce + 9660cb6
commit 194799d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/js/helpers/call_screen_manager.js b/js/helpers/call_screen_manager.js
@@ -228,9 +228,15 @@
   }
 
   var CallScreenManager = {
-    launch: function(type, params, contact) {
+    launch: function(type, params) {
       if (type !== 'incoming') {
-        // TODO bug 1053338 if busy, reject call.
+        // If we are already on a call, we shouldn't allow calling another user
+        // until we have a proper multi-party feature in place.
+        // Bug 1058628 - Do not allow make a call while there is another one in
+        // place
+        if (_inCall) {
+          return;
+        }
         _launchAttention(type, params);
         return;
       }

diff --git a/js/version.js b/js/version.js
@@ -1 +1 @@
-Version = { id: '7c2edc7' };
+Version = { id: '9cecfd4' };