From e74d4c11d46e1e914183ee522f75ae8393a0e151 Mon Sep 17 00:00:00 2001
From: Vishwas Shashidhar <vishwas.shashidhar@symphony.com>
Date: Thu, 14 Sep 2017 16:30:13 +0530
Subject: [PATCH] electron-130: fixes the issue raised

---
 js/dialogs/showLoadError.js | 27 +++++++++++++++------------
 js/windowMgr.js             |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/js/dialogs/showLoadError.js b/js/dialogs/showLoadError.js
index 4d6fc70a..9c8c4625 100644
--- a/js/dialogs/showLoadError.js
+++ b/js/dialogs/showLoadError.js
@@ -12,8 +12,9 @@ const logLevels = require('../enums/logLevels.js');
  * @param  {String} errorDesc        Description of error
  * @param  {Number} errorCode        Error code
  * @param  {function} retryCallback  Callback when user clicks reload
+ * @param {Boolean} showDialog Indicates if a dialog need to be show to a user
  */
-function showLoadFailure(win, url, errorDesc, errorCode, retryCallback) {
+function showLoadFailure(win, url, errorDesc, errorCode, retryCallback, showDialog) {
     let msg;
     if (url) {
         msg = 'Error loading URL:\n' + url;
@@ -27,16 +28,18 @@ function showLoadFailure(win, url, errorDesc, errorCode, retryCallback) {
         msg += '\n\nError Code: ' + errorCode;
     }
 
-    electron.dialog.showMessageBox(win, {
-        type: 'error',
-        buttons: ['Reload', 'Ignore'],
-        defaultId: 0,
-        cancelId: 1,
-        noLink: true,
-        title: 'Loading Error',
-        message: msg
-    }, response);
-
+    if (showDialog) {
+        electron.dialog.showMessageBox(win, {
+            type: 'error',
+            buttons: ['Reload', 'Ignore'],
+            defaultId: 0,
+            cancelId: 1,
+            noLink: true,
+            title: 'Loading Error',
+            message: msg
+        }, response);
+    }
+    
     log.send(logLevels.WARNING, 'Load failure msg: ' + errorDesc +
         ' errorCode: ' + errorCode + ' for url:' + url);
 
@@ -57,7 +60,7 @@ function showLoadFailure(win, url, errorDesc, errorCode, retryCallback) {
  */
 function showNetworkConnectivityError(win, url, retryCallback) {
     let errorDesc = 'Network connectivity has been lost, check your internet connection.';
-    showLoadFailure(win, url, errorDesc, 0, retryCallback);
+    showLoadFailure(win, url, errorDesc, 0, retryCallback, true);
 }
 
 module.exports = { showLoadFailure, showNetworkConnectivityError };
\ No newline at end of file
diff --git a/js/windowMgr.js b/js/windowMgr.js
index 10df3f7f..c5216a94 100644
--- a/js/windowMgr.js
+++ b/js/windowMgr.js
@@ -177,7 +177,7 @@ function doCreateMainWindow(initialUrl, initialBounds) {
 
     mainWindow.webContents.on('did-fail-load', function (event, errorCode,
                                                          errorDesc, validatedURL) {
-        loadErrors.showLoadFailure(mainWindow, validatedURL, errorDesc, errorCode, retry);
+        loadErrors.showLoadFailure(mainWindow, validatedURL, errorDesc, errorCode, retry, false);
     });
 
     addWindowKey(key, mainWindow);