diff --git a/Common/OSVersion.cpp b/Common/OSVersion.cpp index 1103fb8ad6..4bdc8cfbb5 100644 --- a/Common/OSVersion.cpp +++ b/Common/OSVersion.cpp @@ -125,15 +125,18 @@ std::string GetWindowsSystemArchitecture() { ZeroMemory(&sysinfo, sizeof(SYSTEM_INFO)); GetNativeSystemInfo(&sysinfo); - if (sysinfo.wProcessorArchitecture & PROCESSOR_ARCHITECTURE_AMD64) - return "(x64)"; - // Need to check for equality here, since ANDing with 0 is always 0. - else if (sysinfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) + switch (sysinfo.wProcessorArchitecture) { + case PROCESSOR_ARCHITECTURE_INTEL: return "(x86)"; - else if (sysinfo.wProcessorArchitecture & PROCESSOR_ARCHITECTURE_ARM) + case PROCESSOR_ARCHITECTURE_AMD64: + return "(x64)"; + case PROCESSOR_ARCHITECTURE_ARM: return "(ARM)"; - else + case PROCESSOR_ARCHITECTURE_ARM64: + return "(ARM64)"; + default: return "(Unknown)"; + } } #endif