зеркало из https://github.com/electron/electron.git
fix: crash when `dialog.showMessageBoxSync` with missing buttons (#40996)
* fix: crash when dialog.showMessageBoxSync missing buttons * chore: feedback from review
This commit is contained in:
Родитель
df7f07a8af
Коммит
7e6fb97a2f
|
@ -76,15 +76,16 @@ NSAlert* CreateNSAlert(const MessageBoxSettings& settings) {
|
|||
[[ns_buttons objectAtIndex:settings.default_id] setKeyEquivalent:@"\r"];
|
||||
}
|
||||
|
||||
// Bind cancel id button to escape key if there is more than one button
|
||||
if (button_count > 1 && settings.cancel_id >= 0 &&
|
||||
settings.cancel_id < button_count) {
|
||||
[[ns_buttons objectAtIndex:settings.cancel_id] setKeyEquivalent:@"\e"];
|
||||
}
|
||||
if (button_count > 1 && settings.cancel_id >= 0) {
|
||||
// Bind cancel id button to escape key if there is more than one button.
|
||||
if (settings.cancel_id < button_count) {
|
||||
[[ns_buttons objectAtIndex:settings.cancel_id] setKeyEquivalent:@"\e"];
|
||||
}
|
||||
|
||||
// TODO(@codebytere): This behavior violates HIG & should be deprecated.
|
||||
if (settings.cancel_id >= 0 && settings.cancel_id == settings.default_id) {
|
||||
[[ns_buttons objectAtIndex:settings.default_id] highlight:YES];
|
||||
// TODO(@codebytere): This behavior violates HIG & should be deprecated.
|
||||
if (settings.cancel_id == settings.default_id) {
|
||||
[[ns_buttons objectAtIndex:settings.default_id] highlight:YES];
|
||||
}
|
||||
}
|
||||
|
||||
if (!settings.checkbox_label.empty()) {
|
||||
|
|
|
@ -146,6 +146,22 @@ describe('dialog module', () => {
|
|||
expect(result.response).to.equal(0);
|
||||
});
|
||||
|
||||
it('does not crash when there is a defaultId but no buttons', async () => {
|
||||
const controller = new AbortController();
|
||||
const signal = controller.signal;
|
||||
const w = new BrowserWindow();
|
||||
const p = dialog.showMessageBox(w, {
|
||||
signal,
|
||||
message: 'i am message',
|
||||
type: 'info',
|
||||
defaultId: 0,
|
||||
title: 'i am title'
|
||||
});
|
||||
controller.abort();
|
||||
const result = await p;
|
||||
expect(result.response).to.equal(0);
|
||||
});
|
||||
|
||||
it('cancels message box', async () => {
|
||||
const controller = new AbortController();
|
||||
const signal = controller.signal;
|
||||
|
|
Загрузка…
Ссылка в новой задаче