Mercurial > hg > forks > geeqie
changeset 2706:3040da7c5c35
Fix #523: <Esc> in "Really continue?" copy confirmation dialog leads to crash
https://github.com/BestImageViewer/geeqie/issues/523
Patch by Michael Cross and Andreas Rönnquist
| author | Colin Clark <colin.clark@cclark.uk> |
|---|---|
| date | Mon, 22 Jan 2018 13:25:41 +0000 |
| parents | beda48f55142 |
| children | e0251a8eba95 |
| files | src/ui_utildlg.c |
| diffstat | 1 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ui_utildlg.c Sun Jan 21 17:26:55 2018 +0000 +++ b/src/ui_utildlg.c Mon Jan 22 13:25:41 2018 +0000 @@ -186,8 +186,15 @@ if (event->keyval == GDK_KEY_Escape) { - if (gd->cancel_cb) gd->cancel_cb(gd, gd->data); - else if (auto_close) generic_dialog_click_cb(widget, data); + if (gd->cancel_cb) + { + gd->cancel_cb(gd, gd->data); + if (auto_close) generic_dialog_close(gd); + } + else + { + if (auto_close) generic_dialog_click_cb(widget, data); + } return TRUE; } return FALSE;