diff --git a/SafeExamBrowser.Browser/BrowserApplicationInstance.cs b/SafeExamBrowser.Browser/BrowserApplicationInstance.cs
index a3f6f088..747c081b 100644
--- a/SafeExamBrowser.Browser/BrowserApplicationInstance.cs
+++ b/SafeExamBrowser.Browser/BrowserApplicationInstance.cs
@@ -220,9 +220,6 @@ namespace SafeExamBrowser.Browser
window.UpdateAddress(address);
}
- ///
- /// TODO: LoadError.html is not used, as navigating back from it doesn't work! Remove page if no better solution can be found.
- ///
private void Control_LoadFailed(int errorCode, string errorText, string url)
{
if (errorCode == (int) CefErrorCode.None)
@@ -239,8 +236,8 @@ namespace SafeExamBrowser.Browser
}
else
{
- var title = text.Get(TextKey.Browser_LoadErrorPageTitle);
- var message = text.Get(TextKey.Browser_LoadErrorPageMessage).Replace("%%URL%%", url) + $" {errorText} ({errorCode})";
+ var title = text.Get(TextKey.Browser_LoadErrorTitle);
+ var message = text.Get(TextKey.Browser_LoadErrorMessage).Replace("%%URL%%", url) + $" {errorText} ({errorCode})";
logger.Warn($"Request for '{url}' failed: {errorText} ({errorCode}).");
diff --git a/SafeExamBrowser.Browser/Pages/HtmlLoader.cs b/SafeExamBrowser.Browser/Pages/HtmlLoader.cs
index eb1b361f..27c2393f 100644
--- a/SafeExamBrowser.Browser/Pages/HtmlLoader.cs
+++ b/SafeExamBrowser.Browser/Pages/HtmlLoader.cs
@@ -54,23 +54,5 @@ namespace SafeExamBrowser.Browser.Pages
return html;
}
}
-
- internal string LoadErrorPage()
- {
- var assembly = Assembly.GetAssembly(typeof(HtmlLoader));
- var path = $"{typeof(HtmlLoader).Namespace}.LoadError.html";
-
- using (var stream = assembly.GetManifestResourceStream(path))
- using (var reader = new StreamReader(stream))
- {
- var html = reader.ReadToEnd();
-
- html = html.Replace("%%MESSAGE%%", text.Get(TextKey.Browser_LoadErrorPageMessage));
- html = html.Replace("%%RETRY_BUTTON%%", text.Get(TextKey.Browser_LoadErrorPageButton));
- html = html.Replace("%%TITLE%%", text.Get(TextKey.Browser_LoadErrorPageTitle));
-
- return html;
- }
- }
}
}
diff --git a/SafeExamBrowser.Browser/Pages/LoadError.html b/SafeExamBrowser.Browser/Pages/LoadError.html
deleted file mode 100644
index f2ab90e0..00000000
--- a/SafeExamBrowser.Browser/Pages/LoadError.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- %%TITLE%%
-
-
-
-
%%TITLE%%
-
%%MESSAGE%%
-
%%STATUS%%
-
-