piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1264 from Stevoisiak/GCM-to-ISO

Browse Source 
Gcm to iso
This commit is contained in:
Ryan Houdek
2014-11-02 11:29:41 -06:00
parent b8cba759f4 d937c072a5
commit 1c41acaddd
11 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -639,10 +639,10 @@ void CFrame::BootGame(const std::string& filename)
if (m_GameListCtrl->GetSelectedISO()->IsValid())
bootfile = m_GameListCtrl->GetSelectedISO()->GetFileName();
}
else if (!StartUp.m_strDefaultGCM.empty() &&
File::Exists(StartUp.m_strDefaultGCM))
else if (!StartUp.m_strDefaultISO.empty() &&
File::Exists(StartUp.m_strDefaultISO))
{
bootfile = StartUp.m_strDefaultGCM;
bootfile = StartUp.m_strDefaultISO;
}
else
{
@ -1831,7 +1831,7 @@ void CFrame::UpdateGUI()
if (m_GameListCtrl->IsEnabled())
{
// Prepare to load Default ISO, enable play button
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM.empty())
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultISO.empty())
{
if (m_ToolBar)
m_ToolBar->EnableTool(IDM_PLAY, true);