Merge pull request #645 from jhsrennie/master

Make sure keymaps are always loaded when a profile is loaded
xbmc · Jan 21, 2012 · 4e3e8f3 · 4e3e8f3
2 parents aea36b1 + ae726a1
commit 4e3e8f3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp
@@ -416,7 +416,7 @@ void CButtonTranslator::RemoveDevice(CStdString& strDevice)
   Load();
 }
 
-bool CButtonTranslator::Load(void)
+bool CButtonTranslator::Load(bool AlwaysLoad)
 {
   m_translatorMap.clear();
 
@@ -429,8 +429,11 @@ bool CButtonTranslator::Load(void)
   };
   bool success = false;
 
-  // If we've already loaded the m_baseMap we don't need to load it again
-  if (m_Loaded)
+  // If we've already loaded the m_baseMap we don't need to load it
+  // again - this speeds up reloads caused by plugging and unplugging
+  // HID devices. However if AlwaysLoad is true always load the keymaps
+  // from scratch.
+  if (m_Loaded && !AlwaysLoad)
   {
     m_translatorMap = m_baseMap;
   }

diff --git a/xbmc/input/ButtonTranslator.h b/xbmc/input/ButtonTranslator.h
@@ -69,7 +69,7 @@ class CButtonTranslator
   void RemoveDevice(CStdString& strDevice);
 
   /// loads Lircmap.xml/IRSSmap.xml (if enabled) and Keymap.xml
-  bool Load(void);
+  bool Load(bool AlwaysLoad = false);
   /// clears the maps
   void Clear();
 

diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp
@@ -951,7 +951,7 @@ bool CSettings::LoadProfile(unsigned int index)
     CStdString strLanguagePath;
     strLanguagePath.Format("special://xbmc/language/%s/strings.xml", strLanguage.c_str());
 
-    CButtonTranslator::GetInstance().Load();
+    CButtonTranslator::GetInstance().Load(true);
     g_localizeStrings.Load(strLanguagePath);
 
     g_Mouse.SetEnabled(g_guiSettings.GetBool("input.enablemouse"));