summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorMatthew Parlane <parlane@gmail.com>2015-11-24 10:44:52 +1300
committerMatthew Parlane <parlane@gmail.com>2015-11-24 10:44:52 +1300
commitf92a36d86c529f845f355bf5c488cbe09fc6d43d (patch)
tree91b6cbe908894aea16bce9117e3d44d36bd5945a /Source
parent1bbec988fa70744260ffb44f9fe468ffda4323b9 (diff)
parent1ea9b36e3bf1fae5a502cb5fea52632dcd34b638 (diff)
Merge pull request #3283 from RisingFog/patch-1
Fix Frame Advance Hold Delay Changes
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/DolphinWX/Frame.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 75a9de022e..60d9075b6e 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -1568,12 +1568,16 @@ void CFrame::HandleFrameSkipHotkeys()
wxCommandEvent evt;
evt.SetId(IDM_FRAMESTEP);
CFrame::OnFrameStep(evt);
- if (holdFrameStepDelay > 0 && frameStepCount == 0)
+ if (holdFrameStepDelay > 0)
holdFrameStep = true;
}
if (frameStepCount < FRAME_STEP_DELAY)
+ {
++frameStepCount;
+ if (holdFrameStep)
+ holdFrameStep = false;
+ }
if (frameStepCount == FRAME_STEP_DELAY && holdFrameStep && holdFrameStepDelayCount >= holdFrameStepDelay)
{