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 --git a/src/ui_utildlg.c b/src/ui_utildlg.c
index ea17bb2..601d307 100644 (file)
--- a/src/ui_utildlg.c
+++ b/src/ui_utildlg.c
@@ -186,8 +186,15 @@ static gboolean generic_dialog_key_press_cb(GtkWidget *widget, GdkEventKey *even
 
        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;