From 4fff04db3ce16c72d8b3b95df2285a129605fde4 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Fri, 1 Nov 2019 01:30:24 -0500 Subject: Core: Load custom textures after inputs has been loaded and avoid sending force texture reload during startup for dynamic textures. This ensures that custom texture loading only happens once and users don't see any weird flashes on startup --- Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp') diff --git a/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp b/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp index ad200e70a4..58c2c84d18 100644 --- a/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp +++ b/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp @@ -17,6 +17,7 @@ #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" @@ -259,6 +260,8 @@ void DynamicInputTextureConfiguration::GenerateTextures(const IniFile::Section* if (!any_dirty) return; + if (Core::GetState() == Core::State::Starting) + return; if (!g_renderer) return; g_renderer->ForceReloadTextures(); -- cgit v1.2.3