[openmeetings] branch 4.0.x 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 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


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

commit 4256de2dfec7906491a1cb956e2d389318b6e723
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Jul 20 11:03:14 2018 +0700

    [OPENMEETINGS-1142] media device list is retrieved as expected in FF
---
 openmeetings-flash/src/main/flex/main.mxml                         | 2 ++
 .../src/main/java/org/apache/openmeetings/web/room/settings.js     | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/openmeetings-flash/src/main/flex/main.mxml 
b/openmeetings-flash/src/main/flex/main.mxml
index 135161e..14292bb 100644
--- a/openmeetings-flash/src/main/flex/main.mxml
+++ b/openmeetings-flash/src/main/flex/main.mxml
@@ -140,10 +140,12 @@
                                case 'settings': {
                                        
ExternalInterface.addCallback("camChanged", function (val:int):void {
                                                selectedCam = val;
+                                               video.reset();
                                                camChanged(null);
                                        });
                                        
ExternalInterface.addCallback("micChanged", function (val:int):void {
                                                selectedMic = val;
+                                               video.reset();
                                                camChanged(null);
                                        });
                                        
ExternalInterface.addCallback("resChanged", function (width:int, 
height:int):void {
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
index 4d39f05..f77132c 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
@@ -124,10 +124,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) {