From 4f0705fd70a15820162d4f338fb7a3cfa1648cdd Mon Sep 17 00:00:00 2001 From: gnick79 Date: Sat, 5 Mar 2011 16:36:47 +0000 Subject: * Italian translation update + minor GUI adjustements, CPUID Detect cleanup... video profile selection is disabled if a game is running git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7302 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/CPUDetect.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'Source/Core/Common/Src/CPUDetect.cpp') diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp index 45aed22d17..077985a2b7 100644 --- a/Source/Core/Common/Src/CPUDetect.cpp +++ b/Source/Core/Common/Src/CPUDetect.cpp @@ -174,7 +174,7 @@ void CPUInfo::Detect() if ((cpu_id[3] >> 29) & 1) bLongMode = true; } - num_cores = logical_cpu_count; + num_cores = (logical_cpu_count == 0) ? 1 : logical_cpu_count; if (max_ex_fn >= 0x80000008) { // Get number of cores. This is a bit complicated. Following AMD manual here. @@ -190,11 +190,7 @@ void CPUInfo::Detect() cores_x_package = ((logical_cpu_count % cores_x_package) == 0) ? cores_x_package : 1; num_cores = (cores_x_package > 1) ? cores_x_package : num_cores; logical_cpu_count /= cores_x_package; - } else if (vendor == VENDOR_OTHER) { //trash block!!?? - num_cores = 1; } - } else { //trash block!!?? - num_cores = 1; } } else { // Use AMD's new method. -- cgit v1.2.3