summaryrefslogtreecommitdiff
path: root/desktop/browser.c
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-04-26 10:26:00 +0100
committerVincent Sanders <vince@kyllikki.org>2016-04-26 10:26:00 +0100
commit7ec49463dafc20f915ce68c789f36458579783c3 (patch)
treec7c6d993a345f83df7f7c86545f7216cfc89f830 /desktop/browser.c
parent5c427ba8459b46bcb63daa74e4e03f2e22ed6deb (diff)
downloadnetsurf-7ec49463dafc20f915ce68c789f36458579783c3.tar.gz
netsurf-7ec49463dafc20f915ce68c789f36458579783c3.tar.bz2
fix error reporting from frameset creation
Diffstat (limited to 'desktop/browser.c')
-rw-r--r--desktop/browser.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/desktop/browser.c b/desktop/browser.c
index 2cc13e32a..9316b771d 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -1311,6 +1311,7 @@ static nserror browser_window_callback(hlcache_handle *c,
const hlcache_event *event, void *pw)
{
struct browser_window *bw = pw;
+ nserror res = NSERROR_OK;
switch (event->type) {
case CONTENT_MSG_DOWNLOAD:
@@ -1414,10 +1415,11 @@ static nserror browser_window_callback(hlcache_handle *c,
}
/* frames */
- if (content_get_type(c) == CONTENT_HTML &&
- html_get_frameset(c) != NULL)
- browser_window_create_frameset(bw,
+ if ((content_get_type(c) == CONTENT_HTML) &&
+ (html_get_frameset(c) != NULL)) {
+ res = browser_window_create_frameset(bw,
html_get_frameset(c));
+ }
if (content_get_type(c) == CONTENT_HTML &&
html_get_iframe(c) != NULL)
browser_window_create_iframes(bw, html_get_iframe(c));
@@ -1704,7 +1706,7 @@ static nserror browser_window_callback(hlcache_handle *c,
break;
}
- return NSERROR_OK;
+ return res;
}