Merge pull request #9488 from iwubcode/dynamic-input-tex-optimizations

InputCommon: fix potential dynamic input texture crash and an optimization

1 files changed, 7 insertions, 1 deletions

diff --git a/Source/Core/InputCommon/DynamicInputTextureManager.cpp b/Source/Core/InputCommon/DynamicInputTextureManager.cpp
index 437d083ee9..31d0ee2aeb 100644
--- a/Source/Core/InputCommon/DynamicInputTextureManager.cpp
+++ b/Source/Core/InputCommon/DynamicInputTextureManager.cpp
@@ -10,9 +10,11 @@
 #include "Common/FileSearch.h"
 #include "Common/FileUtil.h"
 #include "Core/ConfigManager.h"
+#include "Core/Core.h"
 
 #include "InputCommon/DynamicInputTextureConfiguration.h"
 #include "VideoCommon/HiresTextures.h"
+#include "VideoCommon/RenderBase.h"
 
 namespace InputCommon
 {
@@ -41,9 +43,13 @@ void DynamicInputTextureManager::Load()
 void DynamicInputTextureManager::GenerateTextures(const IniFile::Section* sec,
                                                   const std::string& controller_name)
 {
+  bool any_dirty = false;
   for (const auto& configuration : m_configuration)
   {
-    configuration.GenerateTextures(sec, controller_name);
+    any_dirty |= configuration.GenerateTextures(sec, controller_name);
   }
+
+  if (any_dirty && g_renderer && Core::GetState() != Core::State::Starting)
+    g_renderer->ForceReloadTextures();
 }
 }  // namespace InputCommon