Merge pull request #7437 from stenzek/graphics-options-race

Fix race condition caused by opening graphics options while running

4 files changed, 0 insertions, 4 deletions

diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp
index f2299945cc..69b6f47804 100644
--- a/Source/Core/VideoBackends/D3D/main.cpp
+++ b/Source/Core/VideoBackends/D3D/main.cpp
@@ -132,7 +132,6 @@ bool VideoBackend::Initialize(void* window_handle)
   if (window_handle == nullptr)
     return false;
 
-  InitBackendInfo();
   InitializeShared();
 
   if (FAILED(D3D::Create(reinterpret_cast<HWND>(window_handle))))
diff --git a/Source/Core/VideoBackends/Null/NullBackend.cpp b/Source/Core/VideoBackends/Null/NullBackend.cpp
index fa32ce0cf5..f3743773c5 100644
--- a/Source/Core/VideoBackends/Null/NullBackend.cpp
+++ b/Source/Core/VideoBackends/Null/NullBackend.cpp
@@ -57,7 +57,6 @@ void VideoBackend::InitBackendInfo()
 bool VideoBackend::Initialize(void* window_handle)
 {
   InitializeShared();
-  InitBackendInfo();
 
   g_renderer = std::make_unique<Renderer>();
   g_vertex_manager = std::make_unique<VertexManager>();
diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp
index 52d643543f..d2e37f07a9 100644
--- a/Source/Core/VideoBackends/OGL/main.cpp
+++ b/Source/Core/VideoBackends/OGL/main.cpp
@@ -159,7 +159,6 @@ bool VideoBackend::FillBackendInfo()
 
 bool VideoBackend::Initialize(void* window_handle)
 {
-  InitBackendInfo();
   InitializeShared();
 
   GLUtil::InitInterface();
diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp
index 546cf0a45c..6ca183b57c 100644
--- a/Source/Core/VideoBackends/Software/SWmain.cpp
+++ b/Source/Core/VideoBackends/Software/SWmain.cpp
@@ -80,7 +80,6 @@ void VideoSoftware::InitBackendInfo()
 
 bool VideoSoftware::Initialize(void* window_handle)
 {
-  InitBackendInfo();
   InitializeShared();
 
   SWOGLWindow::Init(window_handle);