From 7889126c203ef89d8dbe2612af95e1fc9727e60a Mon Sep 17 00:00:00 2001
From: A-Circle Zhang <cctvyay@163.com>
Date: Wed, 22 Aug 2018 12:22:19 +0800
Subject: [PATCH 1/3] Update player.js

---
 src/js/player.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/js/player.js b/src/js/player.js
index ac4b0e8..5bac4d2 100644
--- a/src/js/player.js
+++ b/src/js/player.js
@@ -436,6 +436,10 @@ class DPlayer {
 
         // video download error: an error occurs
         this.on('error', () => {
+            // Not a video load error, may be poster load failed, see #307
+            if (!this.video.error) {
+                return
+            }
             this.tran && this.notice && this.type !== 'webtorrent' & this.notice(this.tran('Video load failed'), -1);
         });
 

From 76eed8e570b0e2e82bfc104f5bc50fe142c9dc5e Mon Sep 17 00:00:00 2001
From: A-Circle Zhang <cctvyay@163.com>
Date: Wed, 22 Aug 2018 12:24:14 +0800
Subject: [PATCH 2/3] Update player.js

---
 src/js/player.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/player.js b/src/js/player.js
index 5bac4d2..e2728d8 100644
--- a/src/js/player.js
+++ b/src/js/player.js
@@ -436,8 +436,8 @@ class DPlayer {
 
         // video download error: an error occurs
         this.on('error', () => {
-            // Not a video load error, may be poster load failed, see #307
             if (!this.video.error) {
+                // Not a video load error, may be poster load failed, see #307
                 return
             }
             this.tran && this.notice && this.type !== 'webtorrent' & this.notice(this.tran('Video load failed'), -1);

From 72b09d8b74593a3c98ccb734f79feb7edf0e0f5a Mon Sep 17 00:00:00 2001
From: A-Circle Zhang <cctvyay@163.com>
Date: Wed, 22 Aug 2018 12:41:28 +0800
Subject: [PATCH 3/3] Update user.js

---
 src/js/user.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/user.js b/src/js/user.js
index cea9f7c..4fcc670 100644
--- a/src/js/user.js
+++ b/src/js/user.js
@@ -11,7 +11,7 @@ class User {
         };
         this.default = {
             opacity: 0.7,
-            volume: player.options.volume || 0.7,
+            volume: player.options.hasOwnProperty('volume') ? player.options.volume : 0.7,
             unlimited: (player.options.danmaku && player.options.danmaku.unlimited ? 1 : 0) || 0,
             danmaku: 1,
             subtitle: 1
@@ -38,4 +38,4 @@ class User {
     }
 }
 
-export default User;
\ No newline at end of file
+export default User;