Merge pull request #166 from Accedia/develop

Develop

Author: PetyrDzhunov

electron-app/package-lock.json

@@ -2,7 +2,7 @@
   "name": "fit-mitchell-rpa",
   "appname": "REV Import Technology",
   "productName": "REV Import Technology",
-  "version": "1.5.94",
+  "version": "1.5.95",
   "homepage": "./",
   "main": "./dist/main.js",
   "description": "Automation for CCC by FIT",

electron-app/package.json

@@ -1,5 +1,5 @@
 import { ResponseData } from './interfaces/ResponseData';
-import { app, globalShortcut, ipcMain, shell,dialog } from 'electron';
+import { app, globalShortcut, ipcMain, shell, dialog } from 'electron';
 import WindowManager from './utils/window_manager';
 import importer from './utils/importer';
 import { MESSAGE } from './constants/messages';
@@ -69,9 +69,12 @@ class Main {
             log.info(fitMitchellCloudPath);
             const bat = spawn(fitMitchellCloudPath, [], { windowsHide: true });
             log.info('here');
-            
+            bat.on('error', (code) => {
+              dialog.showErrorBox('Error', `The specified file was not found: ${fitMitchellCloudPath}. Please make sure that file FIT.bat is in the specified directory`);
+              app.quit();
+            })
             bat.on('close', (code) => {
-            log.info(`Child process exited with code ${code}`);
+              log.info(`Child process exited with code ${code}`);
               app.quit();
             });
             return;

electron-app/src/main.ts

@@ -82,14 +82,14 @@ class WindowManager {
       if (shouldOpenVBS) {
         try {
           const bat = spawn(fitMitchellCloudPath, [], { windowsHide: true });
+          bat.on('error', (code) => {
+            dialog.showErrorBox('Error', `The specified file was not found: ${fitMitchellCloudPath}. Please make sure that file FIT.bat is in the specified directory`);
+            app.quit();
+          })
           bat.on('close', (code) => {
             console.log(`Child process exited with code ${code}`);
             app.quit();
           });
-          bat.on('error', (code) => {
-            dialog.showErrorBox('Error', `The specified file was not found: ${fitMitchellCloudPath}, Error code : ${code}`);
-            app.quit();
-          })
           return;
         } catch (error) {
           dialog.showErrorBox('Error', 'The specified file was not found: C:\\FIT-Mitchell-Cloud-RO-Import-Tool\\FIT.bat');