From 5be34cd7e5c55a6c59d8b532c42485eed58cccf1 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Tue, 11 Aug 2009 00:35:07 +0000
Subject: [PATCH] random small fixes - fix debug builds, dump ucodes on
 PAD_BUTTON_X, get rid of a never-closed FILE*

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3959 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/DolphinWX/Src/Main.cpp            | 21 +++++++++----------
 .../Core/VideoCommon/Src/OpcodeDecoding.cpp   |  2 +-
 Source/DSPSpy/main_spy.cpp                    |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index 47a09e1a9d..fdbd8cf9c2 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -108,24 +108,23 @@ bool DolphinApp::OnInit()
 #endif
 
 
-	// Show CPU message
+	// "ExtendedTrace" looks freakin dangerous!!!
 	#ifdef _WIN32
 		EXTENDEDTRACEINITIALIZE(".");
 		SetUnhandledExceptionFilter(&MyUnhandledExceptionFilter);
 	#endif
 		
-		// TODO: if First Boot
-		if (!cpu_info.bSSE2) 
-		{
-			PanicAlert("Hi,\n\nDolphin requires that your CPU has support for SSE2 extensions.\n"
-							 "Unfortunately your CPU does not support them, so Dolphin will not run.\n\n"
-							 "Sayonara!\n");
-			return false;
-		}
+	// TODO: if First Boot
+	if (!cpu_info.bSSE2) 
+	{
+		PanicAlert("Hi,\n\nDolphin requires that your CPU has support for SSE2 extensions.\n"
+						 "Unfortunately your CPU does not support them, so Dolphin will not run.\n\n"
+						 "Sayonara!\n");
+		return false;
+	}
 #ifndef __APPLE__
 	// Keep the user config dir free unless user wants to save the working dir
-	FILE* noCheckForInstallDir = fopen(FULL_CONFIG_DIR "portable", "r");
-	if (!noCheckForInstallDir)
+	if (File::Exists(FULL_CONFIG_DIR "portable"))
 	{
 		char tmp[1024];
 		sprintf(tmp, "%s/.dolphin%swd", (const char*)wxStandardPaths::Get().GetUserConfigDir().mb_str(),
diff --git a/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp b/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp
index e631d9957f..bacaaa2322 100644
--- a/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp
+++ b/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp
@@ -258,7 +258,7 @@ static void Decode()
         break;
 
     case GX_CMD_UNKNOWN_METRICS: // zelda 4 swords calls it and checks the metrics registers after that
-		DEBUG_LOG(VIDEO, "GX 0x44: %08x", Cmd);
+		DEBUG_LOG(VIDEO, "GX 0x44: %08x", cmd_byte);
         break;
 
     case GX_CMD_INVL_VC: // Invalidate Vertex Cache	
diff --git a/Source/DSPSpy/main_spy.cpp b/Source/DSPSpy/main_spy.cpp
index 5dbf676f96..57ce76a312 100644
--- a/Source/DSPSpy/main_spy.cpp
+++ b/Source/DSPSpy/main_spy.cpp
@@ -631,7 +631,7 @@ int main()
 #ifdef HW_RVL
 		// Probably could offer to save to sd gecko or something on gc...
 		// The future is web-based reporting ;)
-		if (WPAD_ButtonsDown(0) & WPAD_BUTTON_2)
+		if ((WPAD_ButtonsDown(0) & WPAD_BUTTON_2) || (PAD_ButtonsDown(0) & PAD_BUTTON_X))
 		{
 			dump_all_ucodes();
 		}