Merge pull request #13077 from Dentomologist/graphicswindow_fix_first_opening_during_emulation_startup_crash

GraphicsWindow: Fix crash when opening for the first time during emulation startup

1 files changed, 5 insertions, 8 deletions

diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp
index 1db7fb2ab6..ab5e6c9fe6 100644
--- a/Source/Core/VideoCommon/VideoBackendBase.cpp
+++ b/Source/Core/VideoCommon/VideoBackendBase.cpp
@@ -284,6 +284,11 @@ void VideoBackendBase::ActivateBackend(const std::string& name)
 
 void VideoBackendBase::PopulateBackendInfo(const WindowSystemInfo& wsi)
 {
+  // If the core is running, the backend info will have been populated already. If we did it here,
+  // the UI thread could race with the GPU thread.
+  if (Core::IsRunningOrStarting(Core::System::GetInstance()))
+    return;
+
   g_Config.Refresh();
   // Reset backend_info so if the backend forgets to initialize something it doesn't end up using
   // a value from the previously used renderer
@@ -296,14 +301,6 @@ void VideoBackendBase::PopulateBackendInfo(const WindowSystemInfo& wsi)
   g_Config.VerifyValidity();
 }
 
-void VideoBackendBase::PopulateBackendInfoFromUI(const WindowSystemInfo& wsi)
-{
-  // If the core is running, the backend info will have been populated already.
-  // If we did it here, the UI thread can race with the with the GPU thread.
-  if (!Core::IsRunning(Core::System::GetInstance()))
-    PopulateBackendInfo(wsi);
-}
-
 void VideoBackendBase::DoState(PointerWrap& p)
 {
   auto& system = Core::System::GetInstance();