piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -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

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

@ -501,7 +501,7 @@ void CConfigMain::InitializeGUIValues()
// Paths
RecursiveISOPath->SetValue(SConfig::GetInstance().m_RecursiveISOFolder);
DefaultISO->SetPath(StrToWxStr(startup_params.m_strDefaultGCM));
DefaultISO->SetPath(StrToWxStr(startup_params.m_strDefaultISO));
DVDRoot->SetPath(StrToWxStr(startup_params.m_strDVDRoot));
ApploaderPath->SetPath(StrToWxStr(startup_params.m_strApploader));
NANDRoot->SetPath(StrToWxStr(SConfig::GetInstance().m_NANDPath));
@ -1284,7 +1284,7 @@ void CConfigMain::RecursiveDirectoryChanged(wxCommandEvent& WXUNUSED (event))
void CConfigMain::DefaultISOChanged(wxFileDirPickerEvent& WXUNUSED (event))
{
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM = WxStrToStr(DefaultISO->GetPath());
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultISO = WxStrToStr(DefaultISO->GetPath());
}
void CConfigMain::DVDRootChanged(wxFileDirPickerEvent& WXUNUSED (event))

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

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

@ -924,7 +924,7 @@ void CGameListCtrl::OnRightClick(wxMouseEvent& event)
// First we have to decide a starting value when we append it
if (selected_iso->GetFileName() == SConfig::GetInstance().
m_LocalCoreStartupParameter.m_strDefaultGCM)
m_LocalCoreStartupParameter.m_strDefaultISO)
popupMenu->FindItem(IDM_SETDEFAULTISO)->Check();
popupMenu->AppendSeparator();
@ -1039,14 +1039,14 @@ void CGameListCtrl::OnSetDefaultISO(wxCommandEvent& event)
if (event.IsChecked())
{
// Write the new default value and save it the ini file
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM =
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultISO =
iso->GetFileName();
SConfig::GetInstance().SaveSettings();
}
else
{
// Otherwise blank the value and save it
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM = "";
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultISO = "";
SConfig::GetInstance().SaveSettings();
}
}