ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop m_LastFilename 

This makes it hard to support different boot params for different boot
types. We should not be making the assumption that Dolphin will
always be booting directly from a file (and in particular, only
using a string).

It's incompatible with future changes that will allow Dolphin to boot
a NAND title properly from well, the NAND, as opposed to booting from
WADs. (And no, treating the title TMD as a "bootable" path doesn't
count. Especially when that approach won't work with NAND images
or IOS LLE.)

And it's confusing to expose this functionality from the UI. It's
pretty bad for UX to change the play button's behaviour depending on
whether the user has launched something before, configured a default
file to boot, added a directory to their game paths.
This commit is contained in:
Léo Lam 2017-05-27 12:15:07 +02:00
parent 0ff8e2b36f
commit 677640ac52
4 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/BootManager.cpp
View File

@ -224,7 +224,6 @@ bool BootCore(const std::string& filename, SConfig::EBootBS2 type)
StartUp.m_BootType = SConfig::BOOT_ISO; StartUp.m_BootType = SConfig::BOOT_ISO;
StartUp.m_strFilename = filename; StartUp.m_strFilename = filename;
StartUp.m_LastFilename = filename;
StartUp.SaveSettings(); StartUp.SaveSettings();
StartUp.bRunCompareClient = false; StartUp.bRunCompareClient = false;
StartUp.bRunCompareServer = false; StartUp.bRunCompareServer = false;

2
Source/Core/Core/ConfigManager.cpp
View File

@ -109,7 +109,6 @@ void SConfig::SaveGeneralSettings(IniFile& ini)
IniFile::Section* general = ini.GetOrCreateSection("General"); IniFile::Section* general = ini.GetOrCreateSection("General");
// General // General
general->Set("LastFilename", m_LastFilename);
general->Set("ShowLag", m_ShowLag); general->Set("ShowLag", m_ShowLag);
general->Set("ShowFrameCount", m_ShowFrameCount); general->Set("ShowFrameCount", m_ShowFrameCount);
@ -418,7 +417,6 @@ void SConfig::LoadGeneralSettings(IniFile& ini)
{ {
IniFile::Section* general = ini.GetOrCreateSection("General"); IniFile::Section* general = ini.GetOrCreateSection("General");
general->Get("LastFilename", &m_LastFilename);
general->Get("ShowLag", &m_ShowLag, false); general->Get("ShowLag", &m_ShowLag, false);
general->Get("ShowFrameCount", &m_ShowFrameCount, false); general->Get("ShowFrameCount", &m_ShowFrameCount, false);
#ifdef USE_GDBSTUB #ifdef USE_GDBSTUB

3
Source/Core/Core/ConfigManager.h
View File

@ -58,9 +58,6 @@ struct SConfig : NonCopyable
bool m_WiimoteContinuousScanning; bool m_WiimoteContinuousScanning;
bool m_WiimoteEnableSpeaker; bool m_WiimoteEnableSpeaker;
// name of the last used filename
std::string m_LastFilename;
// ISO folder // ISO folder
std::vector<std::string> m_ISOFolder; std::vector<std::string> m_ISOFolder;
bool m_RecursiveISOFolder; bool m_RecursiveISOFolder;

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

@ -309,16 +309,8 @@ void CFrame::BootGame(const std::string& filename)
} }
else else
{ {
if (!SConfig::GetInstance().m_LastFilename.empty() && m_game_list_ctrl->BrowseForDirectory();
File::Exists(SConfig::GetInstance().m_LastFilename)) return;
{
bootfile = SConfig::GetInstance().m_LastFilename;
}
else
{
m_game_list_ctrl->BrowseForDirectory();
return;
}
} }
} }
if (!bootfile.empty()) if (!bootfile.empty())
@ -1550,15 +1542,6 @@ void CFrame::UpdateGUI()
GetMenuBar()->FindItem(IDM_RECORD)->Enable(); GetMenuBar()->FindItem(IDM_RECORD)->Enable();
GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable(); GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable();
} }
// Prepare to load last selected file, enable play button
else if (!SConfig::GetInstance().m_LastFilename.empty() &&
File::Exists(SConfig::GetInstance().m_LastFilename))
{
GetToolBar()->EnableTool(IDM_PLAY, true);
GetMenuBar()->FindItem(IDM_PLAY)->Enable();
GetMenuBar()->FindItem(IDM_RECORD)->Enable();
GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable();
}
else else
{ {
// No game has been selected yet, disable play button // No game has been selected yet, disable play button