From 4b623cfc3511caff3b526a5a9898fdfc9bdd77bc Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver.hamlet@gmail.com>
Date: Fri, 15 Jul 2016 18:13:39 +0100
Subject: [PATCH] Fix incorrect handling of errors during init

Closes #600. I stumbled across this issue quite by accident while
working on something else!
---
 src/gui/html/js/initialise.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/gui/html/js/initialise.js b/src/gui/html/js/initialise.js
index 898cb56c..e7b6968b 100644
--- a/src/gui/html/js/initialise.js
+++ b/src/gui/html/js/initialise.js
@@ -229,13 +229,16 @@
       dom.setGameMenuItems(loot.settings.games);
       dom.updateEnabledGames(loot.installedGames);
       dom.updateSelectedGame(loot.game.folder);
-    }).then(getInitErrors)
+    })
+    .catch(handlePromiseError)
+    .then(getInitErrors)
     .then(() => setGameData(loot))
     .catch(handleInitErrors)
     .then(() => {
       if (loot.settings.lastVersion !== loot.version) {
         dom.openDialog('firstRun');
       }
-    }).catch(handlePromiseError);
+    })
+    .catch(handlePromiseError);
   };
 }));