fix: set cancelId to 1 when defaultId == 0 and no 'cancel' button (#1…

…7150)
electron · Feb 27, 2019 · 4f3d611 · 4f3d611
1 parent 119382b
commit 4f3d611
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/browser/api/dialog.js b/lib/browser/api/dialog.js
@@ -263,7 +263,8 @@ module.exports = {
 
     // Choose a default button to get selected when dialog is cancelled.
     if (cancelId == null) {
-      cancelId = 0
+      // If the defaultId is set to 0, ensure the cancel button is a different index (1)
+      cancelId = (defaultId === 0 && buttons.length > 1) ? 1 : 0
       for (let i = 0; i < buttons.length; i++) {
         const text = buttons[i].toLowerCase()
         if (text === 'cancel' || text === 'no') {