Fix suggestions

2020-08-01 16:04:24 +02:00
parent 4cd83e6f73
commit 57fb43fb04
3 changed files with 32 additions and 20 deletions
@@ -470,6 +470,7 @@ function initClient() {

        require(['apphost', 'css!assets/css/librarybrowser'], function (appHost) {
            loadPlugins(appHost, browser).then(function () {
+                console.groupEnd('loading packages');
                onAppReady(browser);
            });
        });
@@ -494,12 +495,18 @@ function initClient() {
                        list = list.concat(window.NativeShell.getPlugins());
                    }

-                    Promise.all(list.map(loadPlugin)).then(function () {
-                        console.groupEnd('loading installed plugins');
-                        require(['packageManager'], function (packageManager) {
-                            packageManager.default.init().then(resolve, reject);
-                        });
-                    }, reject);
+                    Promise.all(list.map(loadPlugin))
+                        .then(function () {
+                            console.debug('finished loading plugins');
+                        })
+                        .catch(() => reject)
+                        .finally(() => {
+                            console.groupEnd('loading installed plugins');
+                            require(['packageManager'], function (packageManager) {
+                                packageManager.default.init().then(resolve, reject);
+                            });
+                        })
+                    ;
                });
            });
        });