From 3e40f283693e9375f3bde797e6bfb30aa50b0901 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Mon, 10 Jun 2013 21:04:55 -0400 Subject: [PATCH] Get video backend name via g_video_backend->GetName() instead of sconfig for movies, since that can be wrong. Also, I still can't code. Or even notice when something obviously doesn't work. --- Source/Core/Core/Src/Movie.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 2f165d1d44..5a81c7d904 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -1168,18 +1168,15 @@ void GetSettings() bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive; bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE; bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; - videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; + videoBackend = g_video_backend->GetName(); iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; if (!Core::g_CoreStartupParameter.bWii) g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; - int temp; - - for(int i = 0; i < 4; ++i ) + for (int i = 0; i < 20; ++i) { - sscanf(SCM_REV_STR + 2 * i, "%2x", &temp ); - revision[i] = temp; + sscanf(SCM_REV_STR + 2 * i, "%02x", &revision[i]); } }