From b8fd68db1b602fe224da8fd2efb61c3e2a0ceda3 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Mon, 16 May 2011 22:11:18 +0000
Subject: If you ask for a new tab, clone must be non-NULL

svn path=/trunk/netsurf/; revision=12422
---
 gtk/window.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'gtk/window.c')

diff --git a/gtk/window.c b/gtk/window.c
index f15e42478..45905f32b 100644
--- a/gtk/window.c
+++ b/gtk/window.c
@@ -527,14 +527,17 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 
 	g->careth = 0;
 
-	if (bw->parent != NULL)
+	if (bw->parent != NULL) {
 		/* Find our parent's scaffolding */
 		g->scaffold = bw->parent->window->scaffold;
-	else if (new_tab)
+	} else if (new_tab) {
+		assert(clone != NULL);
 		g->scaffold = clone->window->scaffold;
-	else
+	} else {
 		/* Now construct and attach a scaffold */
 		g->scaffold = nsgtk_new_scaffolding(g);
+	}
+
 	if (g->scaffold == NULL) {
 		warn_user("NoMemory", 0);
 		free(g);
-- 
cgit v1.2.3