From 558de04cfc1983f587984168fb34aa3767a6f709 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Wed, 10 Nov 2021 18:34:28 -0800 Subject: Common/Assert: Actually use the ASSERT_MSG's log type parameter Since it was unused, nonexistent values were used in a few places. I've replaced them. --- Source/Core/Common/MsgHandler.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Source/Core/Common/MsgHandler.cpp') diff --git a/Source/Core/Common/MsgHandler.cpp b/Source/Core/Common/MsgHandler.cpp index c455beb3ed..26f0f0a89a 100644 --- a/Source/Core/Common/MsgHandler.cpp +++ b/Source/Core/Common/MsgHandler.cpp @@ -106,10 +106,11 @@ std::string GetStringT(const char* string) return s_str_translator(string); } -static bool ShowMessageAlert(std::string_view text, bool yes_no, MsgType style) +static bool ShowMessageAlert(std::string_view text, bool yes_no, Common::Log::LogType log_type, + MsgType style) { const char* caption = GetCaption(style); - ERROR_LOG_FMT(MASTER_LOG, "{}: {}", caption, text); + GENERIC_LOG_FMT(log_type, Common::Log::LogLevel::LERROR, "{}: {}", caption, text); // Panic alerts. if (style == MsgType::Warning && s_abort_on_panic_alert) @@ -129,11 +130,11 @@ static bool ShowMessageAlert(std::string_view text, bool yes_no, MsgType style) // This is the first stop for gui alerts where the log is updated and the // correct window is shown, when using fmt -bool MsgAlertFmtImpl(bool yes_no, MsgType style, fmt::string_view format, - const fmt::format_args& args) +bool MsgAlertFmtImpl(bool yes_no, MsgType style, Common::Log::LogType log_type, + fmt::string_view format, const fmt::format_args& args) { const auto message = fmt::vformat(format, args); - return ShowMessageAlert(message, yes_no, style); + return ShowMessageAlert(message, yes_no, log_type, style); } } // namespace Common -- cgit v1.2.3