From 65ddc22112c5734a8a2899de5595df0d06d8bdef Mon Sep 17 00:00:00 2001
From: George Politis <gp@jitsi.org>
Date: Mon, 20 Oct 2014 14:40:37 +0200
Subject: [PATCH] Fixes error when simulcast is disabled.

---
 index.html   |  2 +-
 simulcast.js | 45 +++++++++++++++++++++++----------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/index.html b/index.html
index e961fa68c..b7da53f04 100644
--- a/index.html
+++ b/index.html
@@ -11,7 +11,7 @@
     <meta itemprop="image" content="/images/jitsilogo.png"/>
     <script src="libs/jquery-2.1.1.min.js"></script>
     <script src="config.js?v=5"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
-    <script src="simulcast.js?v=4"></script><!-- simulcast handling -->
+    <script src="simulcast.js?v=5"></script><!-- simulcast handling -->
     <script src="libs/strophe/strophe.jingle.adapter.js?v=2"></script><!-- strophe.jingle bundles -->
     <script src="libs/strophe/strophe.min.js?v=1"></script>
     <script src="libs/strophe/strophe.disco.min.js?v=1"></script>
diff --git a/simulcast.js b/simulcast.js
index 8990a0cfe..4ee46df97 100644
--- a/simulcast.js
+++ b/simulcast.js
@@ -934,6 +934,29 @@ function SimulcastManager() {
 
     // Create remote simulcast.
     this.simulcastReceiver = new SimulcastReceiver(this.simulcastUtils);
+
+    // Initialize local simulcast.
+
+    // TODO(gp) move into SimulcastManager.prototype.getUserMedia and take into
+    // account constraints.
+    if (!config.enableSimulcast) {
+        this.simulcastSender = new NoSimulcastSender();
+    } else {
+
+        var isChromium = window.chrome,
+            vendorName = window.navigator.vendor;
+        if(isChromium !== null && isChromium !== undefined && vendorName === "Google Inc.") {
+            var ver = parseInt(window.navigator.appVersion.match(/Chrome\/(\d+)\./)[1], 10);
+            if (ver > 37) {
+                this.simulcastSender = new NativeSimulcastSender();
+            } else {
+                this.simulcastSender = new NoSimulcastSender();
+            }
+        } else {
+            this.simulcastSender = new NoSimulcastSender();
+        }
+
+    }
 }
 
 /**
@@ -1010,28 +1033,6 @@ SimulcastManager.prototype.getLocalVideoStream = function() {
  */
 SimulcastManager.prototype.getUserMedia = function (constraints, success, err) {
 
-    // Initialize local simulcast.
-
-    // TODO(gp) take into account constraints.
-    if (!config.enableSimulcast) {
-        this.simulcastSender = new NoSimulcastSender();
-    } else {
-
-        var isChromium = window.chrome,
-            vendorName = window.navigator.vendor;
-        if(isChromium !== null && isChromium !== undefined && vendorName === "Google Inc.") {
-            var ver = parseInt(window.navigator.appVersion.match(/Chrome\/(\d+)\./)[1], 10);
-            if (ver > 37) {
-                this.simulcastSender = new NativeSimulcastSender();
-            } else {
-                this.simulcastSender = new NoSimulcastSender();
-            }
-        } else {
-            this.simulcastSender = new NoSimulcastSender();
-        }
-
-    }
-
     this.simulcastSender.getUserMedia(constraints, success, err);
 };