summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2019-09-16 22:59:10 -0400
committer GitHub <noreply@github.com>2019-09-16 22:59:10 -0400
commitdeb672ba986f474f3de3322f15b1c134f2273b50 (patch)
tree28972f297426d4c6d78797bdf8d1935b033d5b4f /src/emu
parent4d1e1629d4e23252e92b3da3497f95e0497a121c (diff)
parentfeb253dbfd94c37a23e52d0c179d87c38b6e952f (diff)
Merge pull request #5634 from vadosnaprimer/throttling_tweak
Don't force throttling while paused
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/video.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emu/video.cpp b/src/emu/video.cpp
index 03a251d3171..e253afcfc4a 100644
--- a/src/emu/video.cpp
+++ b/src/emu/video.cpp
@@ -808,7 +808,7 @@ int video_manager::effective_frameskip() const
inline bool video_manager::effective_throttle() const
{
// if we're paused, or if the UI is active, we always throttle
- if (machine().paused()) //|| machine().ui().is_menu_active())
+ if (machine().paused() && !machine().options().update_in_pause()) //|| machine().ui().is_menu_active())
return true;
// if we're fast forwarding, we don't throttle