From 3c81d2a5271172467498b9dc7b26b67e6db4f80d Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <dsilvers@netsurf-browser.org>
Date: Mon, 12 Apr 2010 10:57:41 +0000
Subject: [PATCH] Ensure url bar is updated with in-progress URL and restored
 if stop/download occurs

svn path=/trunk/netsurf/; revision=10385
---
 desktop/browser.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/desktop/browser.c b/desktop/browser.c
index 9053427fa..43847baf1 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -437,6 +437,7 @@ void browser_window_go_post(struct browser_window *bw, const char *url,
 
 	bw->loading_content = c;
 	browser_window_start_throbber(bw);
+	browser_window_refresh_url_bar(bw, url, NULL);
 }
 
 
@@ -455,6 +456,11 @@ nserror browser_window_callback(hlcache_handle *c,
 
 		browser_window_convert_to_download(bw, event->data.download);
 
+		if (bw->current_content != NULL) {
+			browser_window_refresh_url_bar(bw,
+				content_get_url(bw->current_content),
+				bw->frag_id);
+		}
 		break;
 
 	case CONTENT_MSG_LOADING:
@@ -847,6 +853,11 @@ void browser_window_stop(struct browser_window *bw)
 			browser_window_stop(&bw->iframes[index]);
 	}
 
+	if (bw->current_content != NULL) {
+		browser_window_refresh_url_bar(bw, 
+				content_get_url(bw->current_content), bw->frag_id);
+	}
+
 	browser_window_stop_throbber(bw);
 }