summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@netsurf-browser.org>2010-04-14 09:23:46 +0000
committerDaniel Silverstone <dsilvers@netsurf-browser.org>2010-04-14 09:23:46 +0000
commit3344b974af61c19ca100130ba6c69f252726e02f (patch)
treeeeffd383af6dcc8eaa31a5f18c86db5fb7b3d012
parent3840e3911b84197cef02615c8febd81abc619f8f (diff)
downloadnetsurf-3344b974af61c19ca100130ba6c69f252726e02f.tar.gz
netsurf-3344b974af61c19ca100130ba6c69f252726e02f.tar.bz2
Move content shuffling to prevent crash during threading through reformat
svn path=/trunk/netsurf/; revision=10396
-rw-r--r--desktop/browser.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop/browser.c b/desktop/browser.c
index 43847baf1..33cd42ba6 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -497,13 +497,13 @@ nserror browser_window_callback(hlcache_handle *c,
hlcache_handle_release(bw->current_content);
}
+ bw->current_content = c;
+ bw->loading_content = NULL;
+
/* Format the new content to the correct dimensions */
gui_window_get_dimensions(bw->window, &width, &height, true);
content_reformat(c, width, height);
- bw->current_content = c;
- bw->loading_content = NULL;
-
browser_window_remove_caret(bw);
bw->scroll = NULL;