summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorSven Weidauer <sven@5sw.de>2018-02-10 00:20:05 +0100
committerSven Weidauer <sven@5sw.de>2018-02-10 00:20:05 +0100
commit885c5ac91823b2f3d94e72028f603274d5cb3a42 (patch)
tree2caeb4ccc21283be8ad458de502234922f6851c7 /desktop
parent7b4163e0216538823630113ed7534c319e19c385 (diff)
parent470dce645bc9cfca1d438f62a8ffe7a6db80a278 (diff)
downloadnetsurf-885c5ac91823b2f3d94e72028f603274d5cb3a42.tar.gz
netsurf-885c5ac91823b2f3d94e72028f603274d5cb3a42.tar.bz2
Merge remote-tracking branch 'origin/master' into svenw/cocoa
Diffstat (limited to 'desktop')
-rw-r--r--desktop/browser_history.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/desktop/browser_history.c b/desktop/browser_history.c
index 640302773..d9db0eb18 100644
--- a/desktop/browser_history.c
+++ b/desktop/browser_history.c
@@ -601,7 +601,9 @@ nserror browser_window_history_go(struct browser_window *bw,
url, NULL, bw, NULL);
history->current = current;
} else {
- browser_window_history_update(bw, bw->current_content);
+ if (bw->current_content != NULL) {
+ browser_window_history_update(bw, bw->current_content);
+ }
history->current = entry;
error = browser_window_navigate(bw, url, NULL,
BW_NAVIGATE_NO_TERMINAL_HISTORY_UPDATE,