From 3d9c903a3b97b109a9f2f62d83bf82f4917a4105 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Thu, 18 Dec 2008 16:06:27 +0000
Subject: [PATCH] fix crash due to AR, remove LOGGING from Common.vcproj (Why
 won't njoy test build in debug?!)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1587 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Common/Common.vcproj      | 12 ++++++------
 Source/Core/Common/Src/Common.h       | 10 ++++------
 Source/Core/Core/Src/ActionReplay.cpp |  3 ++-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj
index a83b5eb785..8c98daa275 100644
--- a/Source/Core/Common/Common.vcproj
+++ b/Source/Core/Common/Common.vcproj
@@ -47,7 +47,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../PluginSpecs"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0;LOGGING"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -341,7 +341,7 @@
 				Optimization="3"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="../../PluginSpecs"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;LOGGING"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
 				EnableEnhancedInstructionSet="2"
@@ -474,10 +474,6 @@
 			RelativePath=".\Src\ChunkFile.h"
 			>
 		</File>
-		<File
-			RelativePath=".\Src\MsgHandler.cpp"
-			>
-		</File>
 		<File
 			RelativePath=".\Src\Common.h"
 			>
@@ -590,6 +586,10 @@
 			RelativePath=".\Src\MemoryUtil.h"
 			>
 		</File>
+		<File
+			RelativePath=".\Src\MsgHandler.cpp"
+			>
+		</File>
 		<File
 			RelativePath=".\Src\Paths.h"
 			>
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index a02851fc35..fe13607ea3 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -30,12 +30,10 @@
 #define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");}
 #endif
 
-#ifdef _WIN32
-	/* Turn on logging with debugging, _DEBUG and DEBUGFAST are still added through
-	   preprocessor definitions only */
-	#if defined(_DEBUG) || defined(DEBUGFAST)
-		#define LOGGING
-	#endif
+/* Turn on logging with debugging, _DEBUG and DEBUGFAST are still added through
+   preprocessor definitions only */
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	#define LOGGING
 #endif
 
 #include "../../../PluginSpecs/CommonTypes.h"
diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp
index 487761c0f5..80b2de3156 100644
--- a/Source/Core/Core/Src/ActionReplay.cpp
+++ b/Source/Core/Core/Src/ActionReplay.cpp
@@ -110,7 +110,8 @@ void LoadCodes(IniFile &ini, bool forceLoad)
 				{
 					currentCode.active = true;
 					currentCode.name = line.substr(2, line.size() - 2);;
-					Core::DisplayMessage("AR code active: " + currentCode.name, 5000);
+					if (!forceLoad)
+						Core::DisplayMessage("AR code active: " + currentCode.name, 5000);
 				}
 				else
 				{