disable sysconf progressive scan by default, fix discrepancies between some corestartup parameters and sysconf settings

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

2 files changed, 8 insertions, 3 deletions

diff --git a/Source/Core/Common/Src/Thread.h b/Source/Core/Common/Src/Thread.h
index 61e69509a1..509c5fe7af 100644
--- a/Source/Core/Common/Src/Thread.h
+++ b/Source/Core/Common/Src/Thread.h
@@ -164,4 +164,4 @@ LONG SyncInterlockedIncrement(LONG *Dest);
 
 } // namespace Common
 
-#endif // _STRINGUTIL_H_
+#endif // _THREAD_H_
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index 55413431a6..ada8b948da 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -167,6 +167,9 @@ void CConfigMain::CreateGUIControls()
 	// Wii
 	arrayStringFor_WiiSystemLang = arrayStringFor_GCSystemLang;
 	arrayStringFor_WiiSystemLang.Insert(wxT("Japanese"), 0);
+	arrayStringFor_WiiSystemLang.Add(wxT("Simplified Chinese"));
+	arrayStringFor_WiiSystemLang.Add(wxT("Traditional Chinese"));
+	arrayStringFor_WiiSystemLang.Add(wxT("Korean"));
 	// GUI
 	arrayStringFor_InterfaceLang = arrayStringFor_GCSystemLang;
 		
@@ -418,13 +421,13 @@ void CConfigMain::CreateGUIControls()
 	WiiScreenSaver = new wxCheckBox(WiiPage, ID_WII_IPL_SSV, wxT("Enable Screen Saver (burn-in reduction)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 	WiiScreenSaver->SetValue(m_SYSCONF[IPL_SSV]!=0);
 	WiiProgressiveScan = new wxCheckBox(WiiPage, ID_WII_IPL_PGS, wxT("Enable Progressive Scan"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	WiiProgressiveScan->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressiveScan);
+	WiiProgressiveScan->SetValue(m_SYSCONF[IPL_PGS]!=0 || SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressiveScan);
 	WiiEuRGB60 = new wxCheckBox(WiiPage, ID_WII_IPL_E60, wxT("Use EuRGB60 Mode (PAL6)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 	WiiEuRGB60->SetValue(m_SYSCONF[IPL_E60]!=0);
 	arrayStringFor_WiiAspectRatio.Add(wxT("4:3")); arrayStringFor_WiiAspectRatio.Add(wxT("16:9"));
 	WiiAspectRatioText = new wxStaticText(WiiPage, ID_WII_IPL_AR_TEXT, wxT("Aspect Ratio:"), wxDefaultPosition, wxDefaultSize);
 	WiiAspectRatio = new wxChoice(WiiPage, ID_WII_IPL_AR, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiAspectRatio, 0, wxDefaultValidator);
-	WiiAspectRatio->SetSelection(SConfig::GetInstance().m_LocalCoreStartupParameter.bWidescreen);
+	WiiAspectRatio->SetSelection(m_SYSCONF[IPL_AR]!=0 || SConfig::GetInstance().m_LocalCoreStartupParameter.bWidescreen);
 	WiiSystemLangText = new wxStaticText(WiiPage, ID_WII_IPL_LNG_TEXT, wxT("System Language:"), wxDefaultPosition, wxDefaultSize);
 	WiiSystemLang = new wxChoice(WiiPage, ID_WII_IPL_LNG, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiSystemLang, 0, wxDefaultValidator);
 	WiiSystemLang->SetSelection(m_SYSCONF[IPL_LNG]);
@@ -790,6 +793,7 @@ void CConfigMain::WiiSettingsChanged(wxCommandEvent& event)
 		break;
 
 	case ID_WII_IPL_AR: // IPL settings
+		m_SYSCONF[IPL_AR] = WiiAspectRatio->GetSelection();
 		SConfig::GetInstance().m_LocalCoreStartupParameter.bWidescreen = WiiAspectRatio->GetSelection() ? true : false;
 		break;
 	case ID_WII_IPL_SSV:
@@ -799,6 +803,7 @@ void CConfigMain::WiiSettingsChanged(wxCommandEvent& event)
 		m_SYSCONF[IPL_LNG] = WiiSystemLang->GetSelection();
 		break;
 	case ID_WII_IPL_PGS:
+		m_SYSCONF[IPL_PGS] = WiiProgressiveScan->IsChecked();
 		SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressiveScan = WiiProgressiveScan->IsChecked();
 		break;
 	case ID_WII_IPL_E60: