From ed8fa5ba7702f1d0674acee26b6d93ddb4f3b415 Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Tue, 22 Dec 2015 16:26:31 +0100
Subject: [PATCH] DolphinWX: Add missing m_ListElfDol cases

---
 Source/Core/DolphinWX/Frame.cpp        |  4 +++-
 Source/Core/DolphinWX/GameListCtrl.cpp | 17 +++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index eb775534ba..a0c46f1d70 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -879,7 +879,8 @@ void CFrame::OnGameListCtrlItemActivated(wxListEvent& WXUNUSED(event))
 	if (!m_GameListCtrl->GetISO(0) &&
 		!((SConfig::GetInstance().m_ListGC &&
 		SConfig::GetInstance().m_ListWii &&
-		SConfig::GetInstance().m_ListWad) &&
+		SConfig::GetInstance().m_ListWad &&
+		SConfig::GetInstance().m_ListElfDol) &&
 		(SConfig::GetInstance().m_ListJap &&
 		SConfig::GetInstance().m_ListUsa  &&
 		SConfig::GetInstance().m_ListPal  &&
@@ -898,6 +899,7 @@ void CFrame::OnGameListCtrlItemActivated(wxListEvent& WXUNUSED(event))
 		SConfig::GetInstance().m_ListGC =
 		SConfig::GetInstance().m_ListWii =
 		SConfig::GetInstance().m_ListWad =
+		SConfig::GetInstance().m_ListElfDol =
 		SConfig::GetInstance().m_ListJap =
 		SConfig::GetInstance().m_ListUsa =
 		SConfig::GetInstance().m_ListPal =
diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp
index 1ad6849f41..e2db47d6bd 100644
--- a/Source/Core/DolphinWX/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/GameListCtrl.cpp
@@ -326,12 +326,13 @@ void CGameListCtrl::Update()
 		// We just check for one hide setting to be enabled, as we may only
 		// have GC games for example, and hide them, so we should show the
 		// second message instead
-		if ((SConfig::GetInstance().m_ListGC  &&
-			SConfig::GetInstance().m_ListWii  &&
-			SConfig::GetInstance().m_ListWad) &&
-			(SConfig::GetInstance().m_ListJap &&
-			SConfig::GetInstance().m_ListUsa  &&
-			SConfig::GetInstance().m_ListPal))
+		if ((SConfig::GetInstance().m_ListGC     &&
+		    SConfig::GetInstance().m_ListWii     &&
+		    SConfig::GetInstance().m_ListWad     &&
+		    SConfig::GetInstance().m_ListElfDol) &&
+		    (SConfig::GetInstance().m_ListJap    &&
+		    SConfig::GetInstance().m_ListUsa     &&
+		    SConfig::GetInstance().m_ListPal))
 		{
 			errorString = _("Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to browse for files...");
 		}
@@ -569,6 +570,10 @@ void CGameListCtrl::ScanForISOs()
 						if (!SConfig::GetInstance().m_ListWad)
 							list = false;
 						break;
+					case DiscIO::IVolume::ELF_DOL:
+						if (!SConfig::GetInstance().m_ListElfDol)
+							list = false;
+						break;
 					default:
 						if (!SConfig::GetInstance().m_ListGC)
 							list = false;