bugfix: windows kill iguana.exe issue

8 years ago · b0dc95b85d
2 changed files with 19 additions and 5 deletions
--- a/gui/main.html
+++ b/gui/main.html
@ -6,12 +6,24 @@
    <script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
    <script type="text/javascript" src="EasyDEX-GUI/assets/global/vendor/jquery/jquery.min.js"></script>
    <script>if (window.module) module = window.module;</script>
+    <script type="text/javascript">
+	function resizeMainWindow() {
+		/* set default map height */
+		var mapH = $(window).height();
+
+		$(".page-main").outerHeight(mapH);
+	}
+	jQuery(document).ready(function() {
+		resizeMainWindow();
+    	window.onresize = function(event) { resizeMainWindow(); };
+	});
+	</script>
 </head>
 <body>

-<div class="row">
-  <div class="col-xs-6 text-center" style="height: 100%; background: #acacac;">Wallet</div>
-  <div class="col-xs-6 text-center" style="height: 100%; background: #bfbfbf;">Wallet</div>
+<div class="row page-main">
+  <div class="col-xs-6 text-center" style="height: 100%; background: url(bg.jpg) no-repeat fixed; vertical-align: middle;"><h1 style="color: white;">Iguana Wallet<h1></div>
+  <div class="col-xs-6 text-center" style="height: 100%; background: url(bg2.jpg) no-repeat fixed; vertical-align: middle;"><h1 style="color: white;">EasyDEX</h1></div>
 </div>

 </body>
--- a/main.js
+++ b/main.js
@ -104,7 +104,8 @@ function createLoadingWindow() {
  //ca333 todo - add os detector to use correct binary - so we can use the same bundle on ALL OS platforms
  if (os.platform() === 'win32') {
    process.chdir(iguanaDir);
-    exec(iguanaWin, {cwd: iguanaDir}); //specify binary in startup
+    //exec(iguanaWin, {cwd: iguanaDir}); //specify binary in startup
+    ig = spawn(iguanaWin);
  }
  if (os.platform() === 'linux') {
    process.chdir(iguanaDir);
@ -137,7 +138,8 @@ function createWindow (status) {
    mainWindow.on('closed', function () {
      if (os.platform() !== 'win32') { ig.kill(); corsproxy_process.kill(); }
      if (os.platform() === 'win32') {
-        exec('TASKKILL /F /IM iguana.exe /T', {cwd: iguanaDir});
+        //exec('TASKKILL /F /IM iguana.exe /T', {cwd: iguanaDir});
+        ig.kill();
      }
      // our app does not have multiwindow - so we dereference the window object instead of
      // putting them into an window_arr