From 84731456fa718111f145906de70fe66dd9437382 Mon Sep 17 00:00:00 2001
From: Chris Burgener <christhecoolist@gmail.com>
Date: Tue, 9 Aug 2016 16:58:18 -0400
Subject: [PATCH] Add Gamecube Language to DTM Header

---
 Source/Core/Core/BootManager.cpp |  2 ++
 Source/Core/Core/Movie.cpp       | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp
index f443491dfc..beef915b0b 100644
--- a/Source/Core/Core/BootManager.cpp
+++ b/Source/Core/Core/BootManager.cpp
@@ -336,6 +336,8 @@ bool BootCore(const std::string& _rFilename)
     StartUp.bFastDiscSpeed = Movie::IsFastDiscSpeed();
     StartUp.iCPUCore = Movie::GetCPUMode();
     StartUp.bSyncGPU = Movie::IsSyncGPU();
+    if (!StartUp.bWii)
+      StartUp.SelectedLanguage = Movie::GetLanguage();
     for (int i = 0; i < 2; ++i)
     {
       if (Movie::IsUsingMemcard(i) && Movie::IsStartingFromClearSave() && !StartUp.bWii)
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
index 5a33bd69bc..c32ead6fa6 100644
--- a/Source/Core/Core/Movie.cpp
+++ b/Source/Core/Core/Movie.cpp
@@ -1515,9 +1515,15 @@ void GetSettings()
   s_bSyncGPU = SConfig::GetInstance().bSyncGPU;
   s_iCPUCore = SConfig::GetInstance().iCPUCore;
   s_bNetPlay = NetPlay::IsNetPlayRunning();
-  s_language = SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG");
-  if (!SConfig::GetInstance().bWii)
+  if (SConfig::GetInstance().bWii)
+  {
+    s_language = SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG");
+  }
+  else
+  {
     s_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA);
+    s_language = SConfig::GetInstance().SelectedLanguage;
+  }
   s_memcards |= (SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD) << 0;
   s_memcards |= (SConfig::GetInstance().m_EXIDevice[1] == EXIDEVICE_MEMORYCARD) << 1;