diff options
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index bf1072b68c..929e435bd9 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -9,6 +9,7 @@ #include <cstdio> #include <future> #include <mutex> +#include <optional> #include <string> #include <vector> #include <wx/app.h> @@ -301,7 +302,7 @@ void CFrame::OpenGeneralConfiguration(wxWindowID tab_id) // 1. Show the game list and boot the selected game. // 2. Default ISO // 3. Boot last selected game -void CFrame::BootGame(const std::string& filename) +void CFrame::BootGame(const std::string& filename, const std::optional<std::string>& savestate_path) { std::string bootfile = filename; SConfig& StartUp = SConfig::GetInstance(); @@ -331,7 +332,7 @@ void CFrame::BootGame(const std::string& filename) } if (!bootfile.empty()) { - StartGame(BootParameters::GenerateFromFile(bootfile)); + StartGame(BootParameters::GenerateFromFile(bootfile, savestate_path)); } } @@ -513,8 +514,9 @@ void CFrame::OnPlayRecording(wxCommandEvent& WXUNUSED(event)) GetMenuBar()->FindItem(IDM_RECORD_READ_ONLY)->Check(); } - if (Movie::PlayInput(WxStrToStr(path))) - BootGame(""); + std::optional<std::string> savestate_path; + if (Movie::PlayInput(WxStrToStr(path), &savestate_path)) + BootGame("", savestate_path); } void CFrame::OnStopRecording(wxCommandEvent& WXUNUSED(event)) |
