From 95e7f4f645a74b3a064db32e4ea11999c75ef346 Mon Sep 17 00:00:00 2001
From: asmsuechan <suenagaryoutaabc@gmail.com>
Date: Sat, 3 Jun 2017 18:47:56 +0900
Subject: [PATCH] Fix errorhandling on cases of invalid notes

---
 browser/main/lib/dataApi/init.js                | 2 +-
 browser/main/lib/dataApi/resolveStorageNotes.js | 1 -
 browser/main/store.js                           | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/main/lib/dataApi/init.js b/browser/main/lib/dataApi/init.js
index 8805b659..67d853e0 100644
--- a/browser/main/lib/dataApi/init.js
+++ b/browser/main/lib/dataApi/init.js
@@ -41,7 +41,7 @@ function init () {
           .then((notes) => {
             let unknownCount = 0
             notes.forEach((note) => {
-              if (!storage.folders.some((folder) => note.folder === folder.key)) {
+              if (note && !storage.folders.some((folder) => note.folder === folder.key)) {
                 unknownCount++
                 storage.folders.push({
                   key: note.folder,
diff --git a/browser/main/lib/dataApi/resolveStorageNotes.js b/browser/main/lib/dataApi/resolveStorageNotes.js
index 8622868d..104b0c00 100644
--- a/browser/main/lib/dataApi/resolveStorageNotes.js
+++ b/browser/main/lib/dataApi/resolveStorageNotes.js
@@ -28,7 +28,6 @@ function resolveStorageNotes (storage) {
         return data
       } catch (err) {
         console.error(notePath)
-        throw err
       }
     })
 
diff --git a/browser/main/store.js b/browser/main/store.js
index f90d886e..628e297e 100644
--- a/browser/main/store.js
+++ b/browser/main/store.js
@@ -24,7 +24,8 @@ function data (state = defaultDataMap(), action) {
         state.storageMap.set(storage.key, storage)
       })
 
-      action.notes.forEach((note) => {
+      action.notes.some((note) => {
+        if (note === undefined) return true
         let uniqueKey = note.storage + '-' + note.key
         let folderKey = note.storage + '-' + note.folder
         state.noteMap.set(uniqueKey, note)