From 8d74421b109905510c0ae1d63575099fe3cd07af Mon Sep 17 00:00:00 2001
From: Joachim Bauch <bauch@struktur.de>
Date: Wed, 23 Nov 2016 17:24:09 +0100
Subject: [PATCH] Don't start ringer / pickup timeout in conference rooms.

This is a followup to #378, thanks @karlitschek for reporting.
---
 static/js/controllers/uicontroller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/js/controllers/uicontroller.js b/static/js/controllers/uicontroller.js
index 5a255c43..5ea75c38 100644
--- a/static/js/controllers/uicontroller.js
+++ b/static/js/controllers/uicontroller.js
@@ -757,7 +757,7 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'tex
 		});
 
 		$scope.$on("status", function(event, status) {
-			if (status === "connecting" && dialerEnabled) {
+			if (status === "connecting" && dialerEnabled && !$scope.isConferenceRoom()) {
 				dialer.start();
 				// Start accept timeout.
 				ringerTimeout = $timeout(function() {