Merge pull request #1231 from h3poteto/iss-1225

closes #1225 Catch error when can not load image in exifImageUrl

src/renderer/components/atoms/FailoverImg.vue

@@ -50,7 +50,7 @@ export default {
         const transformed = await exifImageUrl(this.src)
         this.originalSrc = transformed
       } catch (err) {
-        console.error(err)
+        console.warn(err)
       }
     }
   },
@@ -62,7 +62,7 @@ export default {
           const transformed = await exifImageUrl(newSrc)
           this.originalSrc = transformed
         } catch (err) {
-          console.error(err)
+          console.warn(err)
         }
       }
     }

src/renderer/components/utils/exifImageUrl.js

@@ -22,11 +22,14 @@ const exifImageUrl = url => {
   return new Promise((resolve, reject) => {
     const extension = parseExtension(url)
     if (!extension) {
-      reject(Error(`url is not image: ${url}`))
+      return reject(Error(`url is not image: ${url}`))
     }
     loadImage(
       url,
       canvas => {
+        if (canvas.type === 'error') {
+          return reject(Error(`can not load image: ${url}`))
+        }
         const data = canvas.toDataURL(extension)
         resolve(data)
       },