From 5d4a2e87f82d9ba7cdc2e6404e87c841262ae765 Mon Sep 17 00:00:00 2001
From: Leonard Kim <leonard.h.kim@gmail.com>
Date: Fri, 13 Jul 2018 10:04:09 -0700
Subject: [PATCH] fix(device-selection): use persisted settings as default
 values if available

---
 react/features/base/settings/reducer.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/react/features/base/settings/reducer.js b/react/features/base/settings/reducer.js
index 57d8af8f8..d38bb77f0 100644
--- a/react/features/base/settings/reducer.js
+++ b/react/features/base/settings/reducer.js
@@ -128,7 +128,14 @@ function _initSettings(featureState) {
         const audioOutputDeviceId
             = window.localStorage.getItem('audioOutputDeviceId') || 'default';
 
-        if (audioOutputDeviceId
+        settings = assignIfDefined({
+            audioOutputDeviceId,
+            cameraDeviceId,
+            localFlipX,
+            micDeviceId
+        }, settings);
+
+        if (settings.audioOutputDeviceId
             !== JitsiMeetJS.mediaDevices.getAudioOutputDevice()) {
             JitsiMeetJS.mediaDevices.setAudioOutputDevice(
                 audioOutputDeviceId
@@ -138,13 +145,6 @@ function _initSettings(featureState) {
                     + 'instead.', ex);
             });
         }
-
-        settings = assignIfDefined({
-            audioOutputDeviceId,
-            cameraDeviceId,
-            localFlipX,
-            micDeviceId
-        }, settings);
     }
 
     // Things we stored in profile earlier