From 10d1d194092a019aa755c84ae4648bae76ceab37 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Tue, 21 May 2013 19:20:22 -0400 Subject: [PATCH] Set graphics settings while playing a movie in UpdateActiveConfig(), so settings can't be changed for a frame. --- Source/Core/Core/Src/Movie.cpp | 5 ----- Source/Core/VideoCommon/Src/VideoConfig.cpp | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 75951df67d..2f165d1d44 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -126,11 +126,6 @@ void FrameUpdate() g_totalFrames = g_currentFrame; g_totalLagCount = g_currentLagCount; } - if (IsPlayingInput() && IsConfigSaved()) - { - SetGraphicsConfig(); - } - if (g_bFrameStep) { Core::SetState(Core::CORE_PAUSE); diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index 6e1bc31e55..7827c0008a 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -10,12 +10,15 @@ #include "VideoCommon.h" #include "FileUtil.h" #include "Core.h" +#include "Movie.h" VideoConfig g_Config; VideoConfig g_ActiveConfig; void UpdateActiveConfig() { + if (Movie::IsPlayingInput() && Movie::IsConfigSaved()) + Movie::SetGraphicsConfig(); g_ActiveConfig = g_Config; }