From b75b2ae8bbeada1a364332596a759f4d0410a852 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Fri, 18 Dec 2009 20:15:50 +0000 Subject: Merge r9731:HEAD from branches/MarkieB/gtkmain to trunk. svn path=/trunk/netsurf/; revision=9737 --- gtk/gtk_tabs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gtk/gtk_tabs.c') diff --git a/gtk/gtk_tabs.c b/gtk/gtk_tabs.c index f0e87bb79..286c388d8 100644 --- a/gtk/gtk_tabs.c +++ b/gtk/gtk_tabs.c @@ -193,13 +193,16 @@ void nsgtk_tab_page_changed(GtkNotebook *notebook, GtkNotebookPage *page, GtkWidget *window = gtk_notebook_get_nth_page(notebook, page_num); struct gui_window *gw = g_object_get_data(G_OBJECT(window), "gui_window"); + if (gw == NULL) + return; struct browser_window *bw = gui_window_get_browser_window(gw); - if ((bw != NULL) && (bw->search_context != NULL)) + if (bw == NULL) + return; + if (bw->search_context != NULL) search_destroy_context(bw->search_context); nsgtk_search_set_forward_state(true, bw); nsgtk_search_set_back_state(true, bw); - if (gw) - nsgtk_scaffolding_set_top_level(gw); + nsgtk_scaffolding_set_top_level(gw); } void nsgtk_tab_close_current(GtkNotebook *notebook) -- cgit v1.2.3