From 34a24ce290cef6ad876e740929c07c3f5c020e14 Mon Sep 17 00:00:00 2001
From: paweldomas <pawel.domas@jitsi.org>
Date: Thu, 4 Aug 2016 09:25:16 -0500
Subject: [PATCH] Fix a crash on IE/Safari when plugin is not installed

---
 .../UI/side_pannels/settings/SettingsMenu.js  | 53 +++++++++++--------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/modules/UI/side_pannels/settings/SettingsMenu.js b/modules/UI/side_pannels/settings/SettingsMenu.js
index a97e41ae4..271b942fe 100644
--- a/modules/UI/side_pannels/settings/SettingsMenu.js
+++ b/modules/UI/side_pannels/settings/SettingsMenu.js
@@ -137,30 +137,37 @@ export default {
 
 
         // DEVICES LIST
-        if (JitsiMeetJS.mediaDevices.isDeviceListAvailable() &&
-            JitsiMeetJS.mediaDevices.isDeviceChangeAvailable()) {
-            this.changeDevicesList([]);
+        JitsiMeetJS.mediaDevices.isDeviceListAvailable()
+            .then((isDeviceListAvailable) => {
+                if (isDeviceListAvailable &&
+                    JitsiMeetJS.mediaDevices.isDeviceChangeAvailable()) {
+                    this._initializeDeviceSelectionSettings(emitter);
+                }
+            });
+    },
 
-            $('#selectCamera').change(function () {
-                let cameraDeviceId = $(this).val();
-                if (cameraDeviceId !== Settings.getCameraDeviceId()) {
-                    emitter.emit(UIEvents.VIDEO_DEVICE_CHANGED, cameraDeviceId);
-                }
-            });
-            $('#selectMic').change(function () {
-                let micDeviceId = $(this).val();
-                if (micDeviceId !== Settings.getMicDeviceId()) {
-                    emitter.emit(UIEvents.AUDIO_DEVICE_CHANGED, micDeviceId);
-                }
-            });
-            $('#selectAudioOutput').change(function () {
-                let audioOutputDeviceId = $(this).val();
-                if (audioOutputDeviceId !== Settings.getAudioOutputDeviceId()) {
-                    emitter.emit(UIEvents.AUDIO_OUTPUT_DEVICE_CHANGED,
-                        audioOutputDeviceId);
-                }
-            });
-        }
+    _initializeDeviceSelectionSettings(emitter) {
+        this.changeDevicesList([]);
+
+        $('#selectCamera').change(function () {
+            let cameraDeviceId = $(this).val();
+            if (cameraDeviceId !== Settings.getCameraDeviceId()) {
+                emitter.emit(UIEvents.VIDEO_DEVICE_CHANGED, cameraDeviceId);
+            }
+        });
+        $('#selectMic').change(function () {
+            let micDeviceId = $(this).val();
+            if (micDeviceId !== Settings.getMicDeviceId()) {
+                emitter.emit(UIEvents.AUDIO_DEVICE_CHANGED, micDeviceId);
+            }
+        });
+        $('#selectAudioOutput').change(function () {
+            let audioOutputDeviceId = $(this).val();
+            if (audioOutputDeviceId !== Settings.getAudioOutputDeviceId()) {
+                emitter.emit(
+                    UIEvents.AUDIO_OUTPUT_DEVICE_CHANGED, audioOutputDeviceId);
+            }
+        });
     },
 
     /**