diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2010-04-18 11:04:13 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2010-04-18 11:04:13 +0000 |
| commit | 3958f3730ba9e48cf9f92b0eff61ac9b0cf95161 (patch) | |
| tree | d5cc3b8cc0daf47abf0f1520d58999800bfb3812 | |
| parent | f373777dab453ee84c05ff8990bf670cf20f7fa8 (diff) | |
| download | netsurf-3958f3730ba9e48cf9f92b0eff61ac9b0cf95161.tar.gz netsurf-3958f3730ba9e48cf9f92b0eff61ac9b0cf95161.tar.bz2 | |
Fix failed assertion in content_convert when process_data fails.
svn path=/trunk/netsurf/; revision=10425
| -rw-r--r-- | content/content.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/content/content.c b/content/content.c index dbb9588de..f6ccb38ec 100644 --- a/content/content.c +++ b/content/content.c @@ -645,8 +645,12 @@ void content_convert(struct content *c) { assert(c); assert(c->type < HANDLER_MAP_COUNT); - assert(c->status == CONTENT_STATUS_LOADING); - + assert(c->status == CONTENT_STATUS_LOADING || + c->status == CONTENT_STATUS_ERROR); + + if (c->status != CONTENT_STATUS_LOADING) + return; + if (c->locked == true) return; |