Don't start ringer / pickup timeout in conference rooms.

This is a followup to #378, thanks @karlitschek for reporting.
10 years ago · 8d74421b10
1 changed files with 1 additions and 1 deletions
--- 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() {