mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-05 15:48:51 +00:00
Logical reorderring of the GUI boot sequence. Also a little clean up in the OpenGL plugin.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5379 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
3b35cb12f2
commit
0a12b9d9f5
7 changed files with 83 additions and 100 deletions
|
@ -455,7 +455,7 @@ bool DolphinApp::OnInit()
|
|||
// First check if we have an elf command line.
|
||||
if (LoadElf && ElfFile != wxEmptyString)
|
||||
{
|
||||
main_frame->StartGame(std::string(ElfFile.mb_str()));
|
||||
main_frame->BootGame(std::string(ElfFile.mb_str()));
|
||||
}
|
||||
// If we have selected Automatic Start, start the default ISO, or if no default
|
||||
// ISO exists, start the last loaded ISO
|
||||
|
@ -467,13 +467,13 @@ bool DolphinApp::OnInit()
|
|||
&& File::Exists(SConfig::GetInstance().m_LocalCoreStartupParameter.
|
||||
m_strDefaultGCM.c_str()))
|
||||
{
|
||||
main_frame->StartGame(SConfig::GetInstance().m_LocalCoreStartupParameter.
|
||||
main_frame->BootGame(SConfig::GetInstance().m_LocalCoreStartupParameter.
|
||||
m_strDefaultGCM);
|
||||
}
|
||||
else if(!SConfig::GetInstance().m_LastFilename.empty()
|
||||
&& File::Exists(SConfig::GetInstance().m_LastFilename.c_str()))
|
||||
{
|
||||
main_frame->StartGame(SConfig::GetInstance().m_LastFilename);
|
||||
main_frame->BootGame(SConfig::GetInstance().m_LastFilename);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue