From f596f351436eb5c5ca949c71d9ef62973686f512 Mon Sep 17 00:00:00 2001
From: TanninOne <sherb@gmx.net>
Date: Thu, 13 Oct 2016 15:59:26 +0200
Subject: [PATCH] updated build script and small bugfixes

---
 app/package.json                                     | 12 +++++++++---
 package.json                                         |  1 -
 .../gamemode_management/GameModeManager.ts           |  2 +-
 src/extensions/welcome_screen/WelcomeScreen.tsx      |  5 ++++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/package.json b/app/package.json
index 1783911d5..e60aaeb21 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,13 +1,13 @@
 {
   "name": "nmm2",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "productName": "Nexus Mod Manager 2 Retribution",
   "description": "Nexus Mod Manager 2 Retribution",
   "author": "Black Tree Gaming Ltd.",
   "license": "GPL-3.0",
   "main": "main.js",
   "engines": {
-    "electron": "1.3.5"
+    "electron": "1.4.3"
   },
   "repository": {
     "type": "git",
@@ -15,11 +15,14 @@
   },
   "dependencies": {
     "bluebird": "^3.4.6",
+    "drivelist": "^3.3.4",
     "electron-squirrel-startup": "^1.0.0",
+    "ffi": "^2.1.0",
     "fs-extra-promise": "^0.4.0",
     "i18next": "^3.4.1",
     "i18next-node-fs-backend": "^0.1.2",
     "node-7z": "^0.4.0",
+    "node-ipc": "^8.9.2",
     "node-rest-client": "^2.0.1",
     "react": "^15.3.0",
     "react-addons-css-transition-group": "^15.3.1",
@@ -28,7 +31,7 @@
     "react-dom": "^15.3.0",
     "react-fontawesome": "^1.1.0",
     "react-i18next": "^1.8.0",
-    "react-layout-pane": "^0.1.16",
+    "react-layout-pane": "TanninOne/react-layout-pane",
     "react-redux": "^4.4.5",
     "redux": "^3.5.2",
     "redux-act": "^0.5.0",
@@ -39,8 +42,11 @@
     "redux-persist": "^3.5.0",
     "redux-persist-node-storage": "^1.0.2",
     "redux-thunk": "^2.1.0",
+    "redux-watcher": "^0.1.2",
+    "ref-union": "^1.0.1",
     "source-map-support": "^0.4.2",
     "string-template": "^1.0.0",
+    "tmp": "^0.0.29",
     "winreg": "^1.2.2",
     "winston": "^2.2.0"
   }
diff --git a/package.json b/package.json
index 07f76c9a7..56775498f 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,6 @@
     "react-layout-pane": "TanninOne/react-layout-pane",
     "react-redux": "^4.4.5",
     "react-shallow-testutils": "^2.0.0",
-    "react-sidebar": "^2.2.1",
     "redux": "^3.5.2",
     "redux-act": "^0.5.0",
     "redux-devtools": "^3.3.1",
diff --git a/src/extensions/gamemode_management/GameModeManager.ts b/src/extensions/gamemode_management/GameModeManager.ts
index ce539410e..b22fc3690 100644
--- a/src/extensions/gamemode_management/GameModeManager.ts
+++ b/src/extensions/gamemode_management/GameModeManager.ts
@@ -159,7 +159,7 @@ class GameModeManager {
 
   private activateGameMode(mode: string, store: Redux.Store<IStateEx>): Promise<Persistor> {
     if (mode === undefined) {
-      return null;
+      return Promise.resolve(null);
     }
 
     const statePath: string = path.join(this.mBasePath, mode, 'state');
diff --git a/src/extensions/welcome_screen/WelcomeScreen.tsx b/src/extensions/welcome_screen/WelcomeScreen.tsx
index 1e7966430..88766cef1 100644
--- a/src/extensions/welcome_screen/WelcomeScreen.tsx
+++ b/src/extensions/welcome_screen/WelcomeScreen.tsx
@@ -134,6 +134,7 @@ class WelcomeScreen extends React.Component<IWelcomeScreenProps, IWelcomeScreenS
 
     return (
       <ToolButton
+        key={ game.id }
         game={ game }
         tool={ tool }
         discovery={ toolDiscovery }
@@ -145,10 +146,12 @@ class WelcomeScreen extends React.Component<IWelcomeScreenProps, IWelcomeScreenS
 
 function mapStateToProps(state: any): IConnectedProps {
   let gameMode: string = state.settings.gameMode.current;
+  let discovered = state.settings.gameMode.discovered[gameMode];
+
   return {
     gameMode,
     knownGames: state.session.gameMode.known,
-    discoveredTools: state.settings.gameMode.discovered[gameMode].tools,
+    discoveredTools: discovered !== undefined ? discovered.tools : undefined,
   };
 }