diff --git a/Common/Net/URL.h b/Common/Net/URL.h index c37162f51f..9b3b96f7bf 100644 --- a/Common/Net/URL.h +++ b/Common/Net/URL.h @@ -120,6 +120,8 @@ struct MultipartFormDataEncoder : UrlEncoder Add(key, value, "", ""); } + using UrlEncoder::Add; + void Add(const std::string &key, const std::string &value, const std::string &filename, const std::string &mimeType) { data += "--" + boundary + "\r\n"; diff --git a/UI/ImDebugger/ImDebugger.cpp b/UI/ImDebugger/ImDebugger.cpp index d010a24f26..f34b8efc1f 100644 --- a/UI/ImDebugger/ImDebugger.cpp +++ b/UI/ImDebugger/ImDebugger.cpp @@ -1899,7 +1899,7 @@ void ImWatchWindow::Draw(ImConfig &cfg, ImControl &control, MIPSDebugInterface * } bool confirmed = ImGui::InputText("##edit", editBuffer_, ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_AutoSelectAll); // Filter for only enter presses - confirmed = confirmed && ImGui::IsKeyPressed(ImGuiKey_Enter) || ImGui::IsKeyPressed(ImGuiKey_KeypadEnter); + confirmed = confirmed && (ImGui::IsKeyPressed(ImGuiKey_Enter) || ImGui::IsKeyPressed(ImGuiKey_KeypadEnter)); if (confirmed || ImGui::IsItemDeactivated()) { watch.SetExpression(editBuffer_, mipsDebug); editingWatchIndex_ = -1; @@ -1935,7 +1935,7 @@ void ImWatchWindow::Draw(ImConfig &cfg, ImControl &control, MIPSDebugInterface * break; case WatchFormat::FLOAT: memcpy(&valuef, &value, sizeof(valuef)); - ImGui::Text("%f", value); + ImGui::Text("%f", static_cast(value)); break; case WatchFormat::STR: if (Memory::IsValidAddress(value)) {