Mercurial > hg > forks > geeqie
changeset 2713:cac6dcf7e2e7
Merge remote-tracking branches 'github/merge-requests/581', 'github/merge-requests/576', 'github/merge-requests/574' and 'github/merge-requests/573'
* github/merge-requests/581:
Fix crash after strange behaviour of the "Really Continue" dialog
* github/merge-requests/576:
Trap build errors
* github/merge-requests/574:
Fix spelling mistake occured/occurred
* github/merge-requests/573:
Partially fix #561: Hi-DPI-aware rendering of images.
| author | Klaus Ethgen <Klaus@Ethgen.de> |
|---|---|
| date | Mon, 22 Jan 2018 21:07:11 +0100 |
| parents | b4543cadf55f (diff) d7f6f1ce57eb (current diff) |
| children | e0251a8eba95 |
| files | |
| diffstat | 1 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ui_utildlg.c Mon Jan 22 21:07:11 2018 +0100 +++ b/src/ui_utildlg.c Mon Jan 22 21:07:11 2018 +0100 @@ -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;