From 42f0a9df4bb511524bb39f71634e8291c67dca64 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Wed, 13 May 2020 23:17:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E5=AA=92=E4=BD=93=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=94=B9=E5=8F=98=E6=9A=82=E5=81=9C=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/components/core/Player.vue | 12 ++++++------
 src/renderer/utils/request.js           |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue
index 18adcf0d..4dbee94b 100644
--- a/src/renderer/components/core/Player.vue
+++ b/src/renderer/components/core/Player.vue
@@ -639,9 +639,7 @@ export default {
         this.setMediaDeviceId('default')
       })
     },
-    handleDeviceChangeStopPlay(devices, device, mediaDeviceId) {
-      if (!device) device = devices.find(device => device.deviceId === 'default')
-      if (!device) device = { label: null }
+    handleDeviceChangeStopPlay(device, mediaDeviceId) {
       // console.log(device)
       // console.log(this.setting.player.isMediaDeviceRemovedStopPlay, this.isPlay, device.label, this.prevDeviceLabel)
       if (
@@ -654,10 +652,12 @@ export default {
       let mediaDeviceId = this.setting.player.mediaDeviceId
       const devices = await navigator.mediaDevices.enumerateDevices()
       let device = devices.find(device => device.deviceId === mediaDeviceId)
-      this.handleDeviceChangeStopPlay(devices, device, mediaDeviceId)
-      if (device) return
+      if (!device) device = devices.find(device => device.deviceId === 'default')
+      if (!device) device = { label: null, deviceId: null }
 
-      this.setMediaDeviceId('default')
+      this.handleDeviceChangeStopPlay(device, mediaDeviceId)
+
+      this.setMediaDeviceId(device.deviceId)
     },
     handlePlayDetailAction({ type, data }) {
       switch (type) {
diff --git a/src/renderer/utils/request.js b/src/renderer/utils/request.js
index 448e8568..b0bb47db 100644
--- a/src/renderer/utils/request.js
+++ b/src/renderer/utils/request.js
@@ -107,7 +107,7 @@ export const httpFetch = (url, options = { method: 'get' }) => {
  * @param {*} index
  */
 export const cancelHttp = requestObj => {
-  console.log(requestObj)
+  // console.log(requestObj)
   if (!requestObj) return
   console.log('cancel:', requestObj.href)
   requestObj.abort()