Country filter fixes/consistency

5 files changed, 55 insertions, 39 deletions

diff --git a/Source/Core/DolphinQt/GameList/GameTracker.cpp b/Source/Core/DolphinQt/GameList/GameTracker.cpp
index a3994548c6..23ebc8a14f 100644
--- a/Source/Core/DolphinQt/GameList/GameTracker.cpp
+++ b/Source/Core/DolphinQt/GameList/GameTracker.cpp
@@ -151,52 +151,57 @@ void DGameTracker::ScanForGames()
 						if (!SConfig::GetInstance().m_ListAustralia)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_GERMANY:
-						if (!SConfig::GetInstance().m_ListGermany)
+					case DiscIO::IVolume::COUNTRY_EUROPE:
+						if (!SConfig::GetInstance().m_ListPal)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_RUSSIA:
-						if (!SConfig::GetInstance().m_ListRussia)
+					case DiscIO::IVolume::COUNTRY_FRANCE:
+						if (!SConfig::GetInstance().m_ListFrance)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_UNKNOWN:
-						if (!SConfig::GetInstance().m_ListUnknown)
+					case DiscIO::IVolume::COUNTRY_GERMANY:
+						if (!SConfig::GetInstance().m_ListGermany)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_TAIWAN:
-						if (!SConfig::GetInstance().m_ListTaiwan)
+					case DiscIO::IVolume::COUNTRY_INTERNATIONAL:
+						if (!SConfig::GetInstance().m_ListInternational)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_KOREA:
-						if (!SConfig::GetInstance().m_ListKorea)
+					case DiscIO::IVolume::COUNTRY_ITALY:
+						if (!SConfig::GetInstance().m_ListItaly)
 							list = false;
 						break;
 					case DiscIO::IVolume::COUNTRY_JAPAN:
 						if (!SConfig::GetInstance().m_ListJap)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_USA:
-						if (!SConfig::GetInstance().m_ListUsa)
+					case DiscIO::IVolume::COUNTRY_KOREA:
+						if (!SConfig::GetInstance().m_ListKorea)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_FRANCE:
-						if (!SConfig::GetInstance().m_ListFrance)
+					case DiscIO::IVolume::COUNTRY_NETHERLANDS:
+						if (!SConfig::GetInstance().m_ListNetherlands)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_ITALY:
-						if (!SConfig::GetInstance().m_ListItaly)
+					case DiscIO::IVolume::COUNTRY_RUSSIA:
+						if (!SConfig::GetInstance().m_ListRussia)
 							list = false;
 						break;
 					case DiscIO::IVolume::COUNTRY_SPAIN:
 						if (!SConfig::GetInstance().m_ListSpain)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_NETHERLANDS:
-						if (!SConfig::GetInstance().m_ListNetherlands)
+					case DiscIO::IVolume::COUNTRY_TAIWAN:
+						if (!SConfig::GetInstance().m_ListTaiwan)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_USA:
+						if (!SConfig::GetInstance().m_ListUsa)
 							list = false;
 						break;
+					case DiscIO::IVolume::COUNTRY_UNKNOWN:
 					default:
-						if (!SConfig::GetInstance().m_ListPal)
+						if (!SConfig::GetInstance().m_ListUnknown)
 							list = false;
 						break;
 				}
diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp
index ca45ce9838..2a36b1da0e 100644
--- a/Source/Core/DolphinWX/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/ConfigMain.cpp
@@ -1211,7 +1211,7 @@ inline u8 CConfigMain::GetSADRCountryCode(int language)
 		countrycode = 1; //Japan
 		break;
 	case 1: //English
-		countrycode = 49; // United States
+		countrycode = 49; //United States
 		break;
 	case 2: //German
 		countrycode = 78; //Germany
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 214da46b02..d8542dece8 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -841,6 +841,7 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event))
 		SConfig::GetInstance().m_ListAustralia &&
 		SConfig::GetInstance().m_ListFrance &&
 		SConfig::GetInstance().m_ListGermany &&
+		SConfig::GetInstance().m_ListInternational &&
 		SConfig::GetInstance().m_ListItaly &&
 		SConfig::GetInstance().m_ListKorea &&
 		SConfig::GetInstance().m_ListNetherlands &&
@@ -858,6 +859,7 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event))
 		SConfig::GetInstance().m_ListAustralia =
 		SConfig::GetInstance().m_ListFrance =
 		SConfig::GetInstance().m_ListGermany =
+		SConfig::GetInstance().m_ListInternational =
 		SConfig::GetInstance().m_ListItaly =
 		SConfig::GetInstance().m_ListKorea =
 		SConfig::GetInstance().m_ListNetherlands =
@@ -875,6 +877,7 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event))
 		GetMenuBar()->FindItem(IDM_LIST_AUSTRALIA)->Check(true);
 		GetMenuBar()->FindItem(IDM_LIST_FRANCE)->Check(true);
 		GetMenuBar()->FindItem(IDM_LIST_GERMANY)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_INTERNATIONAL)->Check(true);
 		GetMenuBar()->FindItem(IDM_LIST_ITALY)->Check(true);
 		GetMenuBar()->FindItem(IDM_LIST_KOREA)->Check(true);
 		GetMenuBar()->FindItem(IDM_LIST_NETHERLANDS)->Check(true);
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index b13c08ab57..08ddcb2e39 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -1906,6 +1906,9 @@ void CFrame::GameListChanged(wxCommandEvent& event)
 	case IDM_LIST_GERMANY:
 		SConfig::GetInstance().m_ListGermany = event.IsChecked();
 		break;
+	case IDM_LIST_INTERNATIONAL:
+		SConfig::GetInstance().m_ListInternational = event.IsChecked();
+		break;
 	case IDM_LIST_ITALY:
 		SConfig::GetInstance().m_ListItaly = event.IsChecked();
 		break;
diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp
index be4ff0ff97..a055aa270d 100644
--- a/Source/Core/DolphinWX/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/GameListCtrl.cpp
@@ -632,52 +632,57 @@ void CGameListCtrl::ScanForISOs()
 						if (!SConfig::GetInstance().m_ListAustralia)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_GERMANY:
-						if (!SConfig::GetInstance().m_ListGermany)
+					case DiscIO::IVolume::COUNTRY_EUROPE:
+						if (!SConfig::GetInstance().m_ListPal)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_RUSSIA:
-						if (!SConfig::GetInstance().m_ListRussia)
+					case DiscIO::IVolume::COUNTRY_FRANCE:
+						if (!SConfig::GetInstance().m_ListFrance)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_UNKNOWN:
-						if (!SConfig::GetInstance().m_ListUnknown)
+					case DiscIO::IVolume::COUNTRY_GERMANY:
+						if (!SConfig::GetInstance().m_ListGermany)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_TAIWAN:
-						if (!SConfig::GetInstance().m_ListTaiwan)
+					case DiscIO::IVolume::COUNTRY_INTERNATIONAL:
+						if (!SConfig::GetInstance().m_ListInternational)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_KOREA:
-						if (!SConfig::GetInstance().m_ListKorea)
+					case DiscIO::IVolume::COUNTRY_ITALY:
+						if (!SConfig::GetInstance().m_ListItaly)
 							list = false;
 						break;
 					case DiscIO::IVolume::COUNTRY_JAPAN:
 						if (!SConfig::GetInstance().m_ListJap)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_USA:
-						if (!SConfig::GetInstance().m_ListUsa)
+					case DiscIO::IVolume::COUNTRY_KOREA:
+						if (!SConfig::GetInstance().m_ListKorea)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_FRANCE:
-						if (!SConfig::GetInstance().m_ListFrance)
+					case DiscIO::IVolume::COUNTRY_NETHERLANDS:
+						if (!SConfig::GetInstance().m_ListNetherlands)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_ITALY:
-						if (!SConfig::GetInstance().m_ListItaly)
+					case DiscIO::IVolume::COUNTRY_RUSSIA:
+						if (!SConfig::GetInstance().m_ListRussia)
 							list = false;
 						break;
 					case DiscIO::IVolume::COUNTRY_SPAIN:
 						if (!SConfig::GetInstance().m_ListSpain)
 							list = false;
 						break;
-					case DiscIO::IVolume::COUNTRY_NETHERLANDS:
-						if (!SConfig::GetInstance().m_ListNetherlands)
+					case DiscIO::IVolume::COUNTRY_TAIWAN:
+						if (!SConfig::GetInstance().m_ListTaiwan)
+							list = false;
+						break;
+					case DiscIO::IVolume::COUNTRY_USA:
+						if (!SConfig::GetInstance().m_ListUsa)
 							list = false;
 						break;
+					case DiscIO::IVolume::COUNTRY_UNKNOWN:
 					default:
-						if (!SConfig::GetInstance().m_ListPal)
+						if (!SConfig::GetInstance().m_ListUnknown)
 							list = false;
 						break;
 				}