From: Simon Tatham <anakin@pobox.com>
Date: Fri, 30 Jul 2004 12:16:57 +0000 (+0000)
Subject: Failed to connect up the `destroy' signal in error_box(), causing
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=f2c240343f98e137228f898169511e139619006a;p=sgt-puzzles.git

Failed to connect up the `destroy' signal in error_box(), causing
gtk_main_quit not to get called, with the result that the whole game
ended up running one gtk_main level lower down. This meant that
final dialog box processing was not performed, so that (for example)
selecting 1x1 in Net, hitting OK and getting an error box, then
selecting a different size and hitting OK again failed to change to
the new size.

[originally from svn r4376]
---

diff --git a/gtk.c b/gtk.c
index 3501f83..b2655b1 100644
--- a/gtk.c
+++ b/gtk.c
@@ -461,6 +461,8 @@ void error_box(GtkWidget *parent, char *msg)
     gtk_window_set_default(GTK_WINDOW(window), ok);
     gtk_signal_connect(GTK_OBJECT(ok), "clicked",
                        GTK_SIGNAL_FUNC(errmsg_button_clicked), window);
+    gtk_signal_connect(GTK_OBJECT(window), "destroy",
+                       GTK_SIGNAL_FUNC(window_destroy), NULL);
     gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
 		       GTK_SIGNAL_FUNC(win_key_press), ok);
     gtk_window_set_modal(GTK_WINDOW(window), TRUE);