From 09f65cc0956ac140ad0377e8fa10accb03ae32da Mon Sep 17 00:00:00 2001 From: Rob Kendrick Date: Sun, 10 Jun 2007 14:59:47 +0000 Subject: Fix destruction of nsgtk windows involving frames, fixes crashes on sites such as news.bbc.co.uk svn path=/trunk/netsurf/; revision=3323 --- gtk/gtk_window.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gtk') diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c index f8ea30f77..0c1bc798c 100644 --- a/gtk/gtk_window.c +++ b/gtk/gtk_window.c @@ -555,9 +555,15 @@ void gui_window_destroy(struct gui_window *g) LOG((" Scaffolding: %p", g->scaffold)); LOG((" Window name: %s", g->bw->name)); + nsgtk_gui_window_detach_child(g); + /* If we're a top-level gui_window, destroy our scaffold */ - if (g->scrolledwindow == 0) + if (g->scrolledwindow == NULL) { + gtk_widget_destroy(GTK_WIDGET(g->viewport)); nsgtk_scaffolding_destroy(g->scaffold); + } else { + gtk_widget_destroy(GTK_WIDGET(g->scrolledwindow)); + } free(g); -- cgit v1.2.3