diff options
| author | Léo Lam <leo@leolam.fr> | 2021-02-12 02:41:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 02:41:11 +0100 |
| commit | 38935f2e4e93a91acebd08c51e4811e0bc487670 (patch) | |
| tree | f7b1050e259f2a4a6f6d07b0a1986a3ea439aa54 /Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp | |
| parent | 0f29e36440f0c1fc14e104577345779687593da1 (diff) | |
| parent | ce7db2e32bb60d4ef5f107dc913ff19f9ad39057 (diff) | |
Merge pull request #9488 from iwubcode/dynamic-input-tex-optimizations
InputCommon: fix potential dynamic input texture crash and an optimization
Diffstat (limited to 'Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp')
| -rw-r--r-- | Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp b/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp index 171b74f3d2..d55099e856 100644 --- a/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp +++ b/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp @@ -17,10 +17,8 @@ #include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/ConfigManager.h" -#include "Core/Core.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ImageOperations.h" -#include "VideoCommon/RenderBase.h" namespace { @@ -251,7 +249,7 @@ DynamicInputTextureConfiguration::DynamicInputTextureConfiguration(const std::st DynamicInputTextureConfiguration::~DynamicInputTextureConfiguration() = default; -void DynamicInputTextureConfiguration::GenerateTextures(const IniFile::Section* sec, +bool DynamicInputTextureConfiguration::GenerateTextures(const IniFile::Section* sec, const std::string& controller_name) const { bool any_dirty = false; @@ -260,13 +258,7 @@ void DynamicInputTextureConfiguration::GenerateTextures(const IniFile::Section* any_dirty |= GenerateTexture(sec, controller_name, texture_data); } - if (!any_dirty) - return; - if (Core::GetState() == Core::State::Starting) - return; - if (!g_renderer) - return; - g_renderer->ForceReloadTextures(); + return any_dirty; } bool DynamicInputTextureConfiguration::GenerateTexture( |