ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3377 from JosJuice/elfdol-case 

DolphinWX: Add missing m_ListElfDol cases
This commit is contained in:
skidau 2015-12-29 11:03:43 +11:00
parent 08bf808d49 ed8fa5ba77
commit c80dede49f
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/Frame.cpp
View File

@ -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 =

17
Source/Core/DolphinWX/GameListCtrl.cpp
View File

@ -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;