# HG changeset patch
# User Colin Clark <colin.clark@cclark.uk>
# Date 1516627541 0
# Node ID 3040da7c5c3572940a6655c57d51fe641ad89c46
# Parent  beda48f55142a623edffde5badbf9d56e3830012
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

diff -r beda48f55142 -r 3040da7c5c35 src/ui_utildlg.c
--- 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;