muskit/spice2x.github.io
0
0
Fork 0
mirror of https://github.com/spice2x/spice2x.github.io.git synced 2026-08-01 22:30:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

patchmanager: various UI fixes (#572)

Browse Source 
## Description of change
* Show more descriptive error when connection fails (for
`ERROR_WINHTTP_NAME_NOT_RESOLVED`)
* ensure patches are reloaded even if importing fails, since existing
checkboxes get reset
This commit is contained in:
bicarus
2026-03-08 19:43:15 -07:00
committed by GitHub
parent a0a7b86508
commit ba4623b009
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spice2x/overlay/windows/patch_manager.cpp
+14 -4
View File
@@ -150,9 +150,17 @@ namespace overlay::windows {
const auto gle = GetLastError(); const auto gle = GetLastError();
log_warning("patchmanager", "WinHttpSendRequest failed: {}", gle); log_warning("patchmanager", "WinHttpSendRequest failed: {}", gle);
url_fetch_errors += fmt::format("WinHttpSendRequest failed: {}\n", gle); url_fetch_errors += fmt::format("WinHttpSendRequest failed: {}\n", gle);
if (gle == 12175) { if (gle == ERROR_WINHTTP_SECURE_FAILURE) {
url_fetch_errors += "\nThis is ERROR_WINHTTP_SECURE_FAILURE - most likely TLS 1.1 / TLS 1.2 error on old OS versions.\n\n"; url_fetch_errors += "\nERROR_WINHTTP_SECURE_FAILURE\n\n";
url_fetch_errors += "Most likely TLS 1.1 / TLS 1.2 error on old OS versions.\n\n";
url_fetch_errors += "Look up MSDN article on 'Update to enable TLS 1.1 and TLS 1.2 as default secure protocols in WinHTTP in Windows' for a fix.\n"; url_fetch_errors += "Look up MSDN article on 'Update to enable TLS 1.1 and TLS 1.2 as default secure protocols in WinHTTP in Windows' for a fix.\n";
} else if (gle == ERROR_WINHTTP_NAME_NOT_RESOLVED) {
url_fetch_errors += "\nERROR_WINHTTP_NAME_NOT_RESOLVED\n\n";
url_fetch_errors += "The server name could not be resolved.\n\n";
url_fetch_errors += "Website is offline, or your internet connection is down.";
} else if (gle == ERROR_WINHTTP_TIMEOUT) {
url_fetch_errors += "\nERROR_WINHTTP_TIMEOUT\n\n";
url_fetch_errors += "The request timed out.";
} }
return result; return result;
} }
@@ -459,7 +467,7 @@ namespace overlay::windows {
&patch_url, &patch_url,
ImGuiInputTextFlags_CharsNoBlank | ImGuiInputTextFlags_AutoSelectAll); ImGuiInputTextFlags_CharsNoBlank | ImGuiInputTextFlags_AutoSelectAll);
if (ImGui::Button("Paste")) { if (ImGui::Button("Paste from clipboard")) {
auto clipboard_url = clipboard::paste_text(); auto clipboard_url = clipboard::paste_text();
if (!clipboard_url.empty()) { if (!clipboard_url.empty()) {
strreplace(clipboard_url, "\r\n", ""); strreplace(clipboard_url, "\r\n", "");
@@ -534,7 +542,9 @@ namespace overlay::windows {
} }
this->config_save(); this->config_save();
} }
reload_local_patches(); // import_remote_patches_to_disk clears out old patches, so regardless of result,
// reload patches from disk
reload_local_patches(true);
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
} }
ImGui::SameLine(); ImGui::SameLine();