summaryrefslogtreecommitdiff
path: root/gtk/window.c
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2011-05-16 22:11:18 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2011-05-16 22:11:18 +0000
commitb8fd68db1b602fe224da8fd2efb61c3e2a0ceda3 (patch)
tree5ae3426fa5e6f1fd8384a3ba82e7fb12949ae90f /gtk/window.c
parent21f01af35abc7656837bf3cb0446cee1ec2ae3f8 (diff)
downloadnetsurf-b8fd68db1b602fe224da8fd2efb61c3e2a0ceda3.tar.gz
netsurf-b8fd68db1b602fe224da8fd2efb61c3e2a0ceda3.tar.bz2
If you ask for a new tab, clone must be non-NULL
svn path=/trunk/netsurf/; revision=12422
Diffstat (limited to 'gtk/window.c')
-rw-r--r--gtk/window.c9
1 files changed, 6 insertions, 3 deletions
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);