From 685e34bc83a85d2fee8cdf59ddd8f4d9486ecb97 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sun, 3 May 2020 12:30:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E9=9F=B3=E6=BA=90=E8=BE=93=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md                    | 1 +
 src/renderer/components/core/Player.vue | 6 +++---
 src/renderer/views/Setting.vue          | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index ae7c46a4..470251ed 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -6,3 +6,4 @@
 
 - 修复按住`Ctrl`等键触发多选机制时不松开按键的情况下切换到其他窗口后再松开按键，这时切回软件不按按键都处在多选模式的问题
 - 修复Linux版开启托盘无法退出的问题
+- 修复某些情况下可能导致的音源输出问题
diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue
index 53712a06..25de8e8a 100644
--- a/src/renderer/components/core/Player.vue
+++ b/src/renderer/components/core/Player.vue
@@ -617,12 +617,12 @@ export default {
     },
     async setMediaDevice() {
       let mediaDeviceId = this.setting.player.mediaDeviceId
-      if (!mediaDeviceId) return
       const devices = await navigator.mediaDevices.enumerateDevices()
       let device = devices.find(device => device.deviceId === mediaDeviceId)
-      if (!device) return this.setMediaDeviceId('default')
+      const deviceId = device ? device.deviceId : 'default'
+
       // console.log(device)
-      this.audio.setSinkId(device.deviceId).catch((err) => {
+      this.audio.setSinkId(deviceId).catch(err => {
         console.log(err)
         this.setMediaDeviceId('default')
       })
diff --git a/src/renderer/views/Setting.vue b/src/renderer/views/Setting.vue
index f48c8bab..004129b0 100644
--- a/src/renderer/views/Setting.vue
+++ b/src/renderer/views/Setting.vue
@@ -614,7 +614,9 @@ export default {
     },
     async getMediaDevice() {
       const devices = await navigator.mediaDevices.enumerateDevices()
-      const audioDevices = devices.filter(device => device.kind === 'audiooutput')
+      let audioDevices = devices.filter(device => device.kind === 'audiooutput')
+      let currentId = this.current_setting.player.mediaDeviceId
+      if (!audioDevices.some(device => device.deviceId === currentId)) this.current_setting.player.mediaDeviceId = 'default'
       this.mediaDevices = audioDevices
       // console.log(this.mediaDevices)
     },