Put getUserMedia call further away from onReady code, to prevent poss…

…ible race condition
erlocator · Sep 12, 2013 · 6ee3ccd · 6ee3ccd
1 parent bf0053d
commit 6ee3ccd
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/priv/www/geofilter.js b/priv/www/geofilter.js
@@ -260,7 +260,8 @@ function init_xmpp() {
         if (RTC.browser == 'firefox') {
             connection.jingle.media_constraints.mandatory['MozDontOfferDataChannel'] = true;
         }
-        getUserMediaWithConstraints(['audio', 'video']);
+	// Connect to XMPP server
+    	connection.connect(client.id + '@' + DOMAIN + "/" + client.geonum, "", onConnect);
     } else {
         //setStatus('webrtc capable browser required');
     }
@@ -326,6 +327,9 @@ function onGetStunAndTurn(iceservers) {
         }
 	// Don't need TURN service, disconnect
 	turn_service_connection.disconnect(); 
+	// Initialize local media
+	getUserMediaWithConstraints(['audio', 'video']);
+
 }
 
 function setStatus(txt) {
@@ -456,7 +460,6 @@ function onMediaReady(event, stream) {
 
     RTC.attachMediaStream($('#local_video'), localStream);
 
-    connection.connect(client.id + '@' + DOMAIN + "/" + client.geonum, "", onConnect);
 }
 
 function onMediaFailure() {