From 9a975705bff532d3a81651145a08e056b0410f8d Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Wed, 2 Feb 2011 17:09:39 +0000 Subject: [PATCH] Fix nogui build, and fix a minor issue with the GFX config dialogs when backends are changed. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7042 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoDX11/Src/main.cpp | 1 + Source/Plugins/Plugin_VideoDX9/Src/main.cpp | 1 + Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 12 ++++++------ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp index 7536cca901..60328c8a83 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp @@ -163,6 +163,7 @@ void VideoBackend::ShowConfig(void *_hParent) diag->ShowModal(); diag->Destroy(); + g_Config.backend_info.Adapters.clear(); DX11::D3D::UnloadDXGI(); DX11::D3D::UnloadD3D(); #endif diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index 34bb34c8cc..1399997ac2 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -145,6 +145,7 @@ void VideoBackend::ShowConfig(void* parent) diag->ShowModal(); diag->Destroy(); + g_Config.backend_info.Adapters.clear(); DX9::D3D::Shutdown(); #endif } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index 0059d07794..df0d0f0840 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -195,9 +195,9 @@ void VideoBackend::Video_Prepare() g_renderer = new Renderer; - s_efbAccessRequested = FALSE; - s_FifoShuttingDown = FALSE; - s_swapRequested = FALSE; + s_efbAccessRequested = false; + s_FifoShuttingDown = false; + s_swapRequested = false; CommandProcessor::Init(); PixelEngine::Init(); @@ -229,9 +229,9 @@ void VideoBackend::Shutdown() { s_PluginInitialized = false; - s_efbAccessRequested = FALSE; - s_FifoShuttingDown = FALSE; - s_swapRequested = FALSE; + s_efbAccessRequested = false; + s_FifoShuttingDown = false; + s_swapRequested = false; DLCache::Shutdown(); Fifo_Shutdown(); OGL::PostProcessing::Shutdown();