The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 16:19:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5516 from leoetlino/drop-last-filename

Browse Source 
Drop m_LastFilename
This commit is contained in:
Leo Lam 2017-06-03 21:32:04 +02:00 committed by GitHub
commit bcc85f9f4d
4 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,8 +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.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