diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index 295ac883de..5e18e4a1fc 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -224,7 +224,6 @@ bool BootCore(const std::string& filename, SConfig::EBootBS2 type) StartUp.m_BootType = SConfig::BOOT_ISO; StartUp.m_strFilename = filename; - StartUp.m_LastFilename = filename; StartUp.SaveSettings(); StartUp.bRunCompareClient = false; StartUp.bRunCompareServer = false; diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 0a1917791d..0eee3bd5e7 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -109,7 +109,6 @@ void SConfig::SaveGeneralSettings(IniFile& ini) IniFile::Section* general = ini.GetOrCreateSection("General"); // General - general->Set("LastFilename", m_LastFilename); general->Set("ShowLag", m_ShowLag); general->Set("ShowFrameCount", m_ShowFrameCount); @@ -418,7 +417,6 @@ void SConfig::LoadGeneralSettings(IniFile& ini) { IniFile::Section* general = ini.GetOrCreateSection("General"); - general->Get("LastFilename", &m_LastFilename); general->Get("ShowLag", &m_ShowLag, false); general->Get("ShowFrameCount", &m_ShowFrameCount, false); #ifdef USE_GDBSTUB diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index 75b8526b75..be01c9c23d 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -58,9 +58,6 @@ struct SConfig : NonCopyable bool m_WiimoteContinuousScanning; bool m_WiimoteEnableSpeaker; - // name of the last used filename - std::string m_LastFilename; - // ISO folder std::vector m_ISOFolder; bool m_RecursiveISOFolder; diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 0ba143172f..7f538563b5 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -309,16 +309,8 @@ void CFrame::BootGame(const std::string& filename) } else { - if (!SConfig::GetInstance().m_LastFilename.empty() && - File::Exists(SConfig::GetInstance().m_LastFilename)) - { - bootfile = SConfig::GetInstance().m_LastFilename; - } - else - { - m_game_list_ctrl->BrowseForDirectory(); - return; - } + m_game_list_ctrl->BrowseForDirectory(); + return; } } if (!bootfile.empty()) @@ -1550,15 +1542,6 @@ void CFrame::UpdateGUI() GetMenuBar()->FindItem(IDM_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 { // No game has been selected yet, disable play button