changeset 2707:b4543cadf55f

Fix crash after strange behaviour of the "Really Continue" dialog
author Michael Cross <mc@xi2.org>
date Mon, 22 Jan 2018 01:21:49 +0100
parents 8ba86a100c53
children cac6dcf7e2e7
files src/ui_utildlg.c
diffstat 1 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ui_utildlg.c	Mon Jan 01 13:40:30 2018 +0100
+++ b/src/ui_utildlg.c	Mon Jan 22 01:21:49 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;