diff options
| author | Rob Kendrick <rjek@netsurf-browser.org> | 2007-06-10 14:59:47 +0000 |
|---|---|---|
| committer | Rob Kendrick <rjek@netsurf-browser.org> | 2007-06-10 14:59:47 +0000 |
| commit | 09f65cc0956ac140ad0377e8fa10accb03ae32da (patch) | |
| tree | 87094ae66cbea1cde33e58b35b70fffcde770d1d /gtk | |
| parent | c5b8f914f70c47199b166f2ad4fd11f0aed65287 (diff) | |
| download | netsurf-09f65cc0956ac140ad0377e8fa10accb03ae32da.tar.gz netsurf-09f65cc0956ac140ad0377e8fa10accb03ae32da.tar.bz2 | |
Fix destruction of nsgtk windows involving frames, fixes crashes on sites such as news.bbc.co.uk
svn path=/trunk/netsurf/; revision=3323
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtk_window.c | 8 |
1 files changed, 7 insertions, 1 deletions
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); |