From 158ec96d55a967f30c9b6c36855d3e3421d48275 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Fri, 1 Jul 2022 19:51:43 +0200 Subject: [PATCH] Move SSE/SSE2 tests to end of query If the test fails we could still see the hardware. --- r5dev/core/init.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/r5dev/core/init.cpp b/r5dev/core/init.cpp index b0af5ec5..b672b445 100644 --- a/r5dev/core/init.cpp +++ b/r5dev/core/init.cpp @@ -376,14 +376,6 @@ void QuerySystemInfo() { const CPUInformation& pi = GetCPUInformation(); - if (!(pi.m_bSSE && pi.m_bSSE2)) - { - if (MessageBoxA(NULL, "SSE and SSE2 are required.", "Unsupported CPU", MB_ICONERROR | MB_OK)) - { - TerminateProcess(GetCurrentProcess(), 0xBAD0C0DE); - } - } - spdlog::info("CPU model identifier : '{:s}'\n", pi.m_szProcessorBrand); spdlog::info("CPU vendor identifier : '{:s}'\n", pi.m_szProcessorID); spdlog::info("CPU core count : '{:12d}' ({:s})\n", pi.m_nPhysicalProcessors, "Physical"); @@ -411,6 +403,14 @@ void QuerySystemInfo() spdlog::error("Unable to retrieve system memory information: {:s}\n", std::system_category().message(static_cast(::GetLastError()))); } + + if (!(pi.m_bSSE && pi.m_bSSE2)) + { + if (MessageBoxA(NULL, "SSE and SSE2 are required.", "Unsupported CPU", MB_ICONERROR | MB_OK)) + { + TerminateProcess(GetCurrentProcess(), 0xBAD0C0DE); + } + } } void PrintHAddress() // Test the sigscan results