From 7f7200b59931e9c411cc51b5bcade699f4ff9ca7 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Tue, 17 Oct 2017 13:47:39 -0500
Subject: [PATCH] Fixes stopping desktop sharing when changing video device to
 use.

---
 conference.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/conference.js b/conference.js
index d451509405..6eb558969c 100644
--- a/conference.js
+++ b/conference.js
@@ -2195,7 +2195,14 @@ export default {
                     return stream;
                 })
                 .then(stream => {
-                    this.useVideoStream(stream);
+                    // if we are screen sharing we do not want to stop it
+                    if (this.isSharingScreen) {
+                        return Promise.resolve();
+                    }
+
+                    return this.useVideoStream(stream);
+                })
+                .then(() => {
                     logger.log('switched local video device');
                     APP.settings.setCameraDeviceId(cameraDeviceId, true);
                 })