From 614f1099075accf077e65672a1bbe4320eefc6a4 Mon Sep 17 00:00:00 2001
From: Yan Yifeng <yanyifeng@xindong.com>
Date: Thu, 4 Apr 2019 16:12:15 +0800
Subject: [PATCH] fix(subtitle): handle error rejected from fetchOnlinsSubs

---
 .../components/Subtitle/SubtitleManager.vue     | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/renderer/components/Subtitle/SubtitleManager.vue b/src/renderer/components/Subtitle/SubtitleManager.vue
index be7e794ea9..6d33bfe49d 100644
--- a/src/renderer/components/Subtitle/SubtitleManager.vue
+++ b/src/renderer/components/Subtitle/SubtitleManager.vue
@@ -47,7 +47,7 @@ import { Subtitle as subtitleActions } from '@/store/actionTypes';
 import SubtitleRenderer from './SubtitleRenderer.vue';
 import SubtitleLoader from './SubtitleLoader';
 import { localLanguageLoader } from './SubtitleLoader/utils';
-import { LOCAL_SUBTITLE_REMOVED } from '../../../shared/notificationcodes';
+import { LOCAL_SUBTITLE_REMOVED, REQUEST_TIMEOUT } from '../../../shared/notificationcodes';
 
 export default {
   name: 'subtitle-manager',
@@ -259,8 +259,19 @@ export default {
             options: { language, data, id },
           }))
           .then(sub => this.addSubtitle(this.normalizeSubtitle(sub), videoSrc))
-          .catch(() => []);
-        const storedSubs = await Promise.all(storedSubIds.map(retrieveSub)).then(flatten);
+          .catch(err => (err instanceof Error ? new Error(err) : err));
+        const storedSubs = await Promise.all(storedSubIds.map(retrieveSub))
+          .then(subtitleResults => subtitleResults.filter((result) => {
+            if (result instanceof Error) {
+              this.addLog('error', {
+                message: 'Request Timeout .',
+                errcode: REQUEST_TIMEOUT,
+              });
+              return [];
+            }
+            return result;
+          }))
+          .then(flatten);
         if (storedSubs.length) return storedSubs;
       }
       const hints = this.generateHints(videoSrc);