summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2003-09-17 17:43:56 +0000
committerJames Bursa <james@netsurf-browser.org>2003-09-17 17:43:56 +0000
commit3db6bacff561d3935b813354318896138094466b (patch)
tree63d58ddb57a6040d5adb5c998e0228b77ae7f82a
parentaf6baf91f004555e5ff38b8d7da64b905b66ba5f (diff)
downloadnetsurf-3db6bacff561d3935b813354318896138094466b.tar.gz
netsurf-3db6bacff561d3935b813354318896138094466b.tar.bz2
[project @ 2003-09-17 17:43:56 by bursa]
Fix instances being removed. svn path=/import/netsurf/; revision=298
-rw-r--r--desktop/browser.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/desktop/browser.c b/desktop/browser.c
index 7f9ab7840..0c1e23c1b 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -185,7 +185,8 @@ void browser_window_destroy(struct browser_window* bw)
assert(bw != 0);
if (bw->current_content != NULL) {
- content_remove_instance(bw->current_content, bw, 0, 0, 0, &bw->current_content_state);
+ if (bw->current_content->status == CONTENT_STATUS_DONE)
+ content_remove_instance(bw->current_content, bw, 0, 0, 0, &bw->current_content_state);
content_remove_user(bw->current_content, browser_window_callback, bw, 0);
}
if (bw->loading_content != NULL) {
@@ -316,7 +317,8 @@ void browser_window_callback(content_msg msg, struct content *c,
gui_remove_gadget(bw->current_content->data.html.elements.gadgets[gc]);
}
}
- content_remove_instance(bw->current_content, bw, 0, 0, 0, &bw->current_content_state);
+ if (bw->current_content->status == CONTENT_STATUS_DONE)
+ content_remove_instance(bw->current_content, bw, 0, 0, 0, &bw->current_content_state);
content_remove_user(bw->current_content, browser_window_callback, bw, 0);
}
bw->current_content = c;