mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-27 06:48:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

InputCommon: Make the "input gate" not racey.

Browse source
This commit is contained in:
Jordan Woyak 2019-11-06 15:59:36 -06:00
parent 93d7b3d159
commit 85ceb37ccd
17 changed files with 32 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Source/Core/InputCommon/ControlReference/ControlReference.cpp
View file

@ -4,19 +4,18 @@
#include "InputCommon/ControlReference/ControlReference.h"
// For InputGateOn()
// This is a bad layering violation, but it's the cleanest
// place I could find to put it.
#include "Core/ConfigManager.h"
#include "Core/Host.h"
using namespace ciface::ExpressionParser;
bool ControlReference::InputGateOn()
static thread_local bool tls_input_gate = true;
void ControlReference::SetInputGate(bool enable)
{
return (SConfig::GetInstance().m_BackgroundInput || Host_RendererHasFocus() ||
Host_UINeedsControllerState()) &&
!Host_UIBlocksControllerState();
tls_input_gate = enable;
}
bool ControlReference::GetInputGate()
{
return tls_input_gate;
}
//
@ -90,7 +89,7 @@ bool OutputReference::IsInput() const
//
ControlState InputReference::State(const ControlState ignore)
{
if (m_parsed_expression && InputGateOn())
if (m_parsed_expression && GetInputGate())
return m_parsed_expression->GetValue() * range;
return 0.0;
}