From 4e36c10c3829cd5315665970f5424dc96bb9fe34 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 1 Jun 2017 23:33:36 +0100
Subject: [PATCH] only unshift default if there is no deviceId===default

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/UserSettings.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index fcb7a70559..5dd6a7fec2 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -958,7 +958,9 @@ module.exports = React.createClass({
 
         const audioInputs = this.state.mediaDevices.audioinput;
         if (audioInputs.length > 0) {
-            audioInputs.unshift(defaultOption);
+            if (!audioInputs.some((input) => input.deviceId === 'default')) {
+                audioInputs.unshift(defaultOption);
+            }
             microphoneDropdown = <div>
                 <h4>Microphone</h4>
                 <Dropdown
@@ -972,7 +974,9 @@ module.exports = React.createClass({
 
         const videoInputs = this.state.mediaDevices.videoinput;
         if (videoInputs.length > 0) {
-            videoInputs.unshift(defaultOption);
+            if (!videoInputs.some((input) => input.deviceId === 'default')) {
+                videoInputs.unshift(defaultOption);
+            }
             webcamDropdown = <div>
                 <h4>Cameras</h4>
                 <Dropdown