From 98687d474b51a00316e89b0ecc1a7e0966e09965 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 2 Apr 2021 02:46:07 +0200 Subject: [PATCH] Move system info to extra line --- rpcs3/main.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/rpcs3/main.cpp b/rpcs3/main.cpp index c90eb83701..12c4e53fe3 100644 --- a/rpcs3/main.cpp +++ b/rpcs3/main.cpp @@ -425,12 +425,19 @@ int main(int argc, char** argv) const std::string firmware_version = utils::get_firmware_version(); const std::string firmware_string = firmware_version.empty() ? " | Missing Firmware" : (" | Firmware version: " + firmware_version); - // Write initial message + // Write RPCS3 version logs::stored_message ver; ver.m.ch = nullptr; ver.m.sev = logs::level::always; ver.stamp = 0; - ver.text = fmt::format("RPCS3 v%s | %s%s\n%s", rpcs3::get_version().to_string(), rpcs3::get_branch(), firmware_string, utils::get_system_info()); + ver.text = fmt::format("RPCS3 v%s | %s%s", rpcs3::get_version().to_string(), rpcs3::get_branch(), firmware_string); + + // Write System information + logs::stored_message sys; + sys.m.ch = nullptr; + sys.m.sev = logs::level::always; + sys.stamp = 0; + sys.text = utils::get_system_info(); // Write OS version logs::stored_message os; @@ -446,7 +453,7 @@ int main(int argc, char** argv) qt.stamp = 0; qt.text = fmt::format("Qt version: Compiled against Qt %s | Run-time uses Qt %s", QT_VERSION_STR, qVersion()); - logs::set_init({std::move(ver), std::move(os), std::move(qt)}); + logs::set_init({std::move(ver), std::move(sys), std::move(os), std::move(qt)}); } #ifdef _WIN32