summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/FrameTools.cpp
diff options
context:
space:
mode:
authorRachel Bryk <RachelBryk@gmail.com>2014-02-18 12:12:49 -0500
committerRachel Bryk <RachelBryk@gmail.com>2014-02-18 12:25:11 -0500
commitb1f77d0191420311ab6a2bb936a088b85e6dcf5a (patch)
tree1f10783fae85ba728c80b9f999f2752e795f0b52 /Source/Core/DolphinWX/FrameTools.cpp
parenta18e8249a4ef0656550461b95c573c86f19aaf66 (diff)
Save frame skipping option, and allow loading it from game ini too.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index b54524f2a6..87e51db736 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -139,6 +139,8 @@ void CFrame::CreateMenu()
emulationMenu->AppendSubMenu(skippingMenu, _("Frame S&kipping"));
for(int i = 0; i < 10; i++)
skippingMenu->Append(IDM_FRAMESKIP0 + i, wxString::Format(wxT("%i"), i), wxEmptyString, wxITEM_RADIO);
+ skippingMenu->Check(IDM_FRAMESKIP0 + SConfig::GetInstance().m_FrameSkip, true);
+ Movie::SetFrameSkipping(SConfig::GetInstance().m_FrameSkip);
emulationMenu->AppendSeparator();
emulationMenu->Append(IDM_SCREENSHOT, GetMenuLabel(HK_SCREENSHOT));
@@ -1547,6 +1549,7 @@ void CFrame::OnFrameSkip(wxCommandEvent& event)
int amount = event.GetId() - IDM_FRAMESKIP0;
Movie::SetFrameSkipping((unsigned int)amount);
+ SConfig::GetInstance().m_FrameSkip = amount;
}