Merge pull request #4891 from willy-b/issue-4883-2

Fix Brave crashing on confirm bug
brave · Oct 19, 2016 · 3840430 · 3840430
2 parents 75c3880 + d1b5392
commit 3840430
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/app/index.js b/app/index.js
@@ -363,11 +363,10 @@ app.on('ready', () => {
   ipcMain.removeAllListeners('window-alert')
   ipcMain.on('window-alert', function (event, message, title) {
     var buttons
-    if (title == null) {
-      title = ''
-    }
+
     buttons = ['OK']
     message = message ? message.toString() : ''
+    title = title ? title.toString() : ''
     dialog.showMessageBox(BrowserWindow.getFocusedWindow(), {
       message: message,
       title: title,
@@ -379,10 +378,10 @@ app.on('ready', () => {
   ipcMain.removeAllListeners('window-confirm')
   ipcMain.on('window-confirm', function (event, message, title) {
     var buttons, cancelId
-    if (title == null) {
-      title = ''
-    }
+
     buttons = ['OK', 'Cancel']
+    message = message ? message.toString() : ''
+    title = title ? title.toString() : ''
     cancelId = 1
     event.returnValue = !dialog.showMessageBox(BrowserWindow.getFocusedWindow(), {
       message: message,