diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-11-02 11:29:41 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-11-02 11:29:41 -0600 |
| commit | 1c41acaddd4a92e89ebe0305d21a00769fe46843 (patch) | |
| tree | d62ec02f8396a5757befa3b89b1c24c23a3fe58c /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | b8cba759f45c9b5039eac2d5e573de836e69e424 (diff) | |
| parent | d937c072a56657b66010fc8e5121773bf294fb16 (diff) | |
Merge pull request #1264 from Stevoisiak/GCM-to-ISO
Gcm to iso
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 1a71da97f9..49b1a677de 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -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); |