show the address when refreshing or stopping

Author: tomysshadow

FlashpointSecurePlayer/Shared.cs

@@ -2099,6 +2099,10 @@ public static string GetValidatedURL(string url) {
         }
 
         public static bool TestInternetURI(Uri uri) {
+            if (uri == null) {
+                return false;
+            }
+
             if (uri.IsFile) {
                 return false;
             }

FlashpointSecurePlayer/WebBrowserMode.cs

@@ -466,6 +466,16 @@ private void ShowToolBar() {
             toolBarToolStrip.Visible = !Fullscreen;
         }
 
+        private void ShowAddress(Uri url) {
+            if (url == null
+                || url.Equals("about:blank")) {
+                addressToolStripSpringTextBox.Text = String.Empty;
+                return;
+            }
+
+            addressToolStripSpringTextBox.Text = url.ToString();
+        }
+
         private bool addressToolStripSpringTextBoxEntered = false;
 
         public void AddressInvalid() {
@@ -503,14 +513,16 @@ public void BrowserStop() {
                 return;
             }
 
+            ShowAddress(closableWebBrowser.Url);
             closableWebBrowser.Stop();
         }
 
         public void BrowserRefresh() {
             if (closableWebBrowser == null) {
                 return;
             }
-            
+
+            ShowAddress(closableWebBrowser.Url);
             closableWebBrowser.Refresh();
         }
 
@@ -726,12 +738,7 @@ private void WebBrowserMode_Deactivate(object sender, EventArgs e) {
         }
 
         private void closableWebBrowser_Navigated(object sender, WebBrowserNavigatedEventArgs e) {
-            if (e.Url.Equals("about:blank")) {
-                addressToolStripSpringTextBox.Text = String.Empty;
-                return;
-            }
-
-            addressToolStripSpringTextBox.Text = e.Url.ToString();
+            ShowAddress(e.Url);
         }
 
         private readonly object downloadCompletedLock = new object();