[openmeetings] branch master updated: [OPENMEETINGS-1142] media device list is retrieved as expected in FF

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 85a5221  [OPENMEETINGS-1142] media device list is retrieved as 
expected in FF
85a5221 is described below

commit 85a52215f88e3589d419247f88d3f9b91189431b
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Jul 20 11:06:42 2018 +0700

    [OPENMEETINGS-1142] media device list is retrieved as expected in FF
---
 .../main/java/org/apache/openmeetings/web/room/settings-base.js    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings-base.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings-base.js
index 3c8fa08..b666517 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings-base.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings-base.js
@@ -298,10 +298,13 @@ var VideoSettings = (function() {
                        .then(function(stream) {
                                const devices = 
navigator.mediaDevices.enumerateDevices()
                                        .then(function(devices) {
+                                               _clear(stream);
                                                return devices;
                                        })
-                                       .catch(function(err) { throw err; });
-                               _clear(stream);
+                                       .catch(function(err) {
+                                               _clear(stream);
+                                               throw err;
+                                       });
                                return devices;
                        })
                        .then(function(devices) {