Merge pull request #434 from toasted-nutbread/error-fixes

Error fixes

3 files changed, 6 insertions, 6 deletions

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 7a4d094b..4a677fea 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -99,7 +99,7 @@ class Database {
             });
             return true;
         } catch (e) {
-            console.error(e);
+            logError(e);
             return false;
         }
     }
diff --git a/ext/bg/js/dictionary-importer.js b/ext/bg/js/dictionary-importer.js
index f9e173ea..254fde4f 100644
--- a/ext/bg/js/dictionary-importer.js
+++ b/ext/bg/js/dictionary-importer.js
@@ -174,7 +174,7 @@ class DictionaryImporter {
                 try {
                     await database.bulkAdd(objectStoreName, entries, i, count);
                 } catch (e) {
-                    errors.push(e);
+                    errors.push(errorToJson(e));
                 }
 
                 loadedCount += count;
diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionaries.js
index b9e4fe82..33ced3b9 100644
--- a/ext/bg/js/settings/dictionaries.js
+++ b/ext/bg/js/settings/dictionaries.js
@@ -555,7 +555,7 @@ function dictionaryErrorsShow(errors) {
     if (errors !== null && errors.length > 0) {
         const uniqueErrors = new Map();
         for (let e of errors) {
-            console.error(e);
+            logError(e);
             e = dictionaryErrorToString(e);
             let count = uniqueErrors.get(e);
             if (typeof count === 'undefined') {
@@ -693,9 +693,9 @@ async function onDictionaryImport(e) {
             await settingsSaveOptions();
 
             if (errors.length > 0) {
-                errors.push(...errors);
-                errors.push(`Dictionary may not have been imported properly: ${errors.length} error${errors.length === 1 ? '' : 's'} reported.`);
-                dictionaryErrorsShow(errors);
+                const errors2 = errors.map((error) => jsonToError(error));
+                errors2.push(`Dictionary may not have been imported properly: ${errors2.length} error${errors2.length === 1 ? '' : 's'} reported.`);
+                dictionaryErrorsShow(errors2);
             }
 
             onDatabaseUpdated();