piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 13:49:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change the order so selected iso will be first and only then the default iso.

Browse Source 
Some other minor cleanup


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4880 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2010-01-18 18:21:27 +00:00
parent 8fec36b22a
commit b5b4d92846
4 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -467,12 +467,11 @@ void CFrame::InitBitmaps()
// Menu items
// ---------------------
// Start the game or change the disc.
// Boot priority:
// 1. Default ISO
// 2. Show the game list and boot the selected game.
// 1. Show the game list and boot the selected game.
// 2. Default ISO
// 3. Boot last selected game
void CFrame::BootGame()
{
@ -481,18 +480,18 @@ void CFrame::BootGame()
if (Core::GetState() != Core::CORE_UNINITIALIZED)
return;
// Start the selected ISO, or try one of the saved paths.
// If all that fails, ask to add a dir and don't boot
if (m_GameListCtrl->GetSelectedISO() != NULL)
{
if (m_GameListCtrl->GetSelectedISO()->IsValid())
BootManager::BootCore(m_GameListCtrl->GetSelectedISO()->GetFileName());
}
else if (!StartUp.m_strDefaultGCM.empty()
&& wxFileExists(wxString(StartUp.m_strDefaultGCM.c_str(), wxConvUTF8)))
{
BootManager::BootCore(StartUp.m_strDefaultGCM);
}
// Start the selected ISO, or try one of the saved paths.
// If all that fails, ask to add a dir and don't boot
else if (m_GameListCtrl->GetSelectedISO() != NULL)
{
if (m_GameListCtrl->GetSelectedISO()->IsValid())
BootManager::BootCore(m_GameListCtrl->GetSelectedISO()->GetFileName());
}
else
{
if (!SConfig::GetInstance().m_LastFilename.empty()