Dolphin:

System Information(InfoWindow.cpp) - Added a method to check what Windows OS you are running(I do not know of a method to check what linux OS someone is using)
             and also added a extended version of the cpu_summarize.
Plugin manager - Temporarily fixed a problem that caused a crashing when pressing Stop reported in Issue 1656

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4561 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 23 insertions, 0 deletions

diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp
index cd77d37346..b09570283d 100644
--- a/Source/Core/Common/Src/CPUDetect.cpp
+++ b/Source/Core/Common/Src/CPUDetect.cpp
@@ -201,3 +201,23 @@ std::string CPUInfo::Summarize()
 	if (bLongMode) sum += ", 64-bit support";
 	return sum;
 }
+
+// Turn the cpu info into a string we can show(This version uses headings and line breaks)
+std::string CPUInfo::Summarize_long()
+{
+	std::string sum;
+	sum = StringFromFormat("CPU Brand: %s\n",cpu_string);
+
+	sum += StringFromFormat("Number of cores: %i \n ",num_cores);
+
+	sum+= "Supported instruction sets:\n";
+
+	if (bSSE) sum += "   -SSE\n";
+	if (bSSE2) sum += "   -SSE2\n";
+	if (bSSE3) sum += "   -SSE3\n";
+	if (bSSSE3) sum += "   -SSSE3\n";
+	if (bSSE4_1) sum += "   -SSE4.1\n";
+	if (bSSE4_2) sum += "   -SSE4.2\n";
+	if (bLongMode) sum += "64-bit supported";
+	return sum;
+}
\ No newline at end of file
diff --git a/Source/Core/Common/Src/CPUDetect.h b/Source/Core/Common/Src/CPUDetect.h
index 55a0de93c9..7d3796f5a8 100644
--- a/Source/Core/Common/Src/CPUDetect.h
+++ b/Source/Core/Common/Src/CPUDetect.h
@@ -58,6 +58,9 @@ struct CPUInfo
 
 	// Turn the cpu info into a string we can show
 	std::string Summarize();
+
+	// Turn the cpu info into a string we can show(This version uses headings and line breaks)
+	std::string Summarize_long();
 };
 
 extern CPUInfo cpu_info;