From 1435c2527add244b7e1590b20e1e4db56b9e0108 Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Fri, 4 Jun 2010 05:21:46 +0000
Subject: [PATCH] After party

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5601 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 SConstruct                          | 6 +++---
 Source/Core/DolphinWX/Src/Frame.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SConstruct b/SConstruct
index db6a0306d6..a75e7f3633 100644
--- a/SConstruct
+++ b/SConstruct
@@ -27,9 +27,6 @@ warnings = [
     'no-conversion',
     ]
 # XXX check for the availability of these (in GCC 4.3 or newer)
-if sys.platform != 'darwin':
-    warnings.append('no-array-bounds')
-    warnings.append('no-unused-result')
 
 compileFlags = [
     '-fno-exceptions',
@@ -213,6 +210,9 @@ elif (flavour == 'release'):
 # more warnings
 if env['lint']:
     warnings.append('error')
+    if sys.platform != 'darwin':
+        warnings.append('no-array-bounds')
+        warnings.append('no-unused-result')
     #warnings.append('unreachable-code')
     #warnings.append('float-equal')
 
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index aeec0142ad..4795bcf0cc 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -714,7 +714,7 @@ void CFrame::OnCustomHostMessage(int Id)
 
 			CPluginManager::GetInstance().OpenDebug(
 				GetHandle(),
-				SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin,
+				SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str(),
 				PLUGIN_TYPE_DSP, false
 				);