From eae59c50d2690e19fc80bf7a17528b870acd38b0 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Fri, 19 Dec 2014 14:10:04 +0100
Subject: [PATCH] Make sure to do negotiation when creating a screensharing
 connection (fixes Firefox screen sharing receive support).

---
 static/js/mediastream/webrtc.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/static/js/mediastream/webrtc.js b/static/js/mediastream/webrtc.js
index 9382a8ae..55b49460 100644
--- a/static/js/mediastream/webrtc.js
+++ b/static/js/mediastream/webrtc.js
@@ -563,10 +563,11 @@ function($, _, PeerCall, PeerConference, PeerXfer, PeerScreenshare, UserMedia, u
 
 		// Connect.
 		peerscreenshare.setInitiate(true); //XXX(longsleep): This creates a data channel which is not needed.
-		peerscreenshare.createPeerConnection(_.bind(function() {
+		peerscreenshare.createPeerConnection(_.bind(function(pc) {
 			peerscreenshare.e.on("negotiationNeeded", _.bind(function(event, currentscreenshare) {
 				this.sendOfferWhenNegotiationNeeded(currentscreenshare, id);
 			}, this));
+			_.defer(pc.negotiationNeeded);
 		}, this));
 		/*
 		peerscreenshare.createOffer(_.bind(function(sessionDescription, currentscreenshare) {