merge fix

gui/EasyDEX-GUI

@@ -1 +1 @@
-Subproject commit d48b6500f4eff5e9a1d55490d11e5f1502f647af
+Subproject commit 490ddb48a4472dfd9abf8792674a83688fdae0d3

main.js

@@ -29,7 +29,7 @@ Promise = require('bluebird');
 
 const appBasicInfo = {
 	name: 'Agama',
-	version: '0.1.7.77a-beta'
+	version: '0.2.0.1a-beta'
 };
 
 app.setName(appBasicInfo.name);
@@ -365,10 +365,10 @@ function createWindow (status) {
 		if (appConfig.edexGuiOnly) {
 			if (appConfig.v2) {
 				shepherd.writeLog('show edex gui');
-				mainWindow.loadURL('http://127.0.0.1:3000');
+				//mainWindow.loadURL('http://127.0.0.1:3000');
 				mainWindow.appConfig = appConfig;
 				mainWindow.appSessionHash = appSessionHash;
-				//mainWindow.loadURL('http://' + appConfig.host + ':' + appConfig.agamaPort + '/gui/EasyDEX-GUI/react/build');
+				mainWindow.loadURL('http://' + appConfig.host + ':' + appConfig.agamaPort + '/gui/EasyDEX-GUI/react/build');
 			} else {
 				shepherd.writeLog('show edex gui');
 				mainWindow.loadURL('http://' + appConfig.host + ':' + appConfig.agamaPort + '/gui/EasyDEX-GUI/');