nJoy: Slight oversight in last commit

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

3 files changed, 9 insertions, 9 deletions

diff --git a/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj b/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj
index 2a50ecafb4..b20c24766c 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj
+++ b/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9.00"

+	Version="9,00"

 	Name="Plugin_nJoy_SDL"

 	ProjectGUID="{521498BE-6089-4780-8223-E67C22F4E068}"

 	RootNamespace="Plugin_nJoy_SDL"

@@ -507,6 +507,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\Src\Config.h"

+				>

+			</File>

+			<File

 				RelativePath=".\Src\nJoy.cpp"

 				>

 			</File>

@@ -539,10 +543,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\Src\Config.h"

-				>

-			</File>

-			<File

 				RelativePath=".\Src\GUI\ConfigAdvanced.cpp"

 				>

 			</File>

diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp
index 0ffd4258e4..f06916a2e2 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp
@@ -105,6 +105,7 @@ void Config::Save(int Slot)
 	// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ

 	file.Set("General", "ShowAdvanced", g_Config.bShowAdvanced);

 	file.Set("General", "SaveByID", g_Config.bSaveByID);

+	file.Set("General", "CheckForFocus", g_Config.bCheckFocus);

 	// ========================

 

 	for (int i = 0; i < 4; i++)

@@ -163,8 +164,7 @@ void Config::Save(int Slot)
 		file.Set(SectionName.c_str(), "eventnum", PadMapping[i].eventnum);

 

 		file.Set(SectionName.c_str(), "Diagonal", PadMapping[i].SDiagonal);

-		file.Set(SectionName.c_str(), "SquareToCircle", PadMapping[i].bSquareToCircle);

-		file.Set(SectionName.c_str(), "CheckForFocus", g_Config.bCheckFocus);

+		file.Set(SectionName.c_str(), "SquareToCircle", PadMapping[i].bSquareToCircle);		

 		// ======================================

 

 		// Debugging

@@ -189,6 +189,7 @@ void Config::Load(bool ChangePad, bool ChangeSaveByID)
 	// Global settings

 	// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ

 	file.Get("General", "ShowAdvanced", &g_Config.bShowAdvanced, false);

+	file.Get("General", "CheckForFocus", &g_Config.bCheckFocus, false);

 	if(!ChangeSaveByID)

 	{

 		file.Get("General", "SaveByID", &Tmp, false); g_Config.bSaveByID = Tmp;

@@ -247,7 +248,6 @@ void Config::Load(bool ChangePad, bool ChangeSaveByID)
 

 		file.Get(SectionName.c_str(), "Diagonal", &PadMapping[i].SDiagonal, "100%");

 		file.Get(SectionName.c_str(), "SquareToCircle", &Tmp, false); PadMapping[i].bSquareToCircle = Tmp;

-		file.Get(SectionName.c_str(), "CheckForFocus", &g_Config.bCheckFocus, false);

 		// =============================

 

 		// Debugging

diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
index 8a742bf6b6..09ad173e4f 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
@@ -825,7 +825,7 @@ void ConfigBox::CreateGUIControls()
 			, i+1
 			));	
 		m_CBCheckFocus[i]->SetToolTip(wxT(
-			"Allow Gamepad input even when Dolphin is not in focus. Out of focus keyboard input is never allowed."));	
+			"Allow gamepad input even when Dolphin is not in focus. Out of focus keyboard input is never allowed."));	
 
 		// Populate settings
 		m_sSettings[i] = new wxBoxSizer ( wxHORIZONTAL );