diff --git a/app/scripts/plugins/plugin-gallery.js b/app/scripts/plugins/plugin-gallery.js index 251645e1..e8fb7fbc 100644 --- a/app/scripts/plugins/plugin-gallery.js +++ b/app/scripts/plugins/plugin-gallery.js @@ -33,22 +33,33 @@ const PluginGallery = { this.logger.error('Network error loading plugins'); resolve(); }); - }).then(data => { - return this.verifySignature(data).then(gallery => { + }) + .then(data => { this.loading = false; - this.loadError = !gallery; - if (gallery) { - this.logger.debug( - `Loaded ${gallery.plugins.length} plugins`, - this.logger.ts(ts) - ); - this.gallery = gallery; - this.saveGallery(gallery); + if (!data) { + this.loadError = true; + Events.emit('plugin-gallery-load-complete'); + return; } + return this.verifySignature(data).then(gallery => { + this.loadError = !gallery; + if (gallery) { + this.logger.debug( + `Loaded ${gallery.plugins.length} plugins`, + this.logger.ts(ts) + ); + this.gallery = gallery; + this.saveGallery(gallery); + } + Events.emit('plugin-gallery-load-complete'); + return gallery; + }); + }) + .catch(e => { + this.loadError = true; + this.logger.error('Error loading plugin gallery', e); Events.emit('plugin-gallery-load-complete'); - return gallery; }); - }); }, verifySignature(gallery) { diff --git a/release-notes.md b/release-notes.md index 90737b38..fb91de0e 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,5 +1,8 @@ Release notes ------------- +##### v1.11.4 (TBD) +`-` fixed displaying errors on the plugins page + ##### v1.11.3 (2019-09-29) `-` fix #1275: starting the app after closing on macOS `-` fix #1276 GDrive connection issues