diff options
| author | Jonathan Marshall <jmarshall@never.you.mind> | 2012-03-22 10:57:14 +1300 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@never.you.mind> | 2012-03-22 10:57:14 +1300 |
| commit | 0406f1b855011eb272238d3822191ba09a74069c (patch) | |
| tree | f4f1af31d649a7641e22abf066d22f030274761f | |
| parent | ae76b4aa47e3844a99df0cc4d3db6a7d140d7683 (diff) | |
a folder isn't a keymap
| -rw-r--r-- | xbmc/input/ButtonTranslator.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp index c403237470..0e76a1c68c 100644 --- a/xbmc/input/ButtonTranslator.cpp +++ b/xbmc/input/ButtonTranslator.cpp @@ -437,7 +437,10 @@ bool CButtonTranslator::Load(bool AlwaysLoad) // Sort the list for filesystem based priorities, e.g. 01-keymap.xml, 02-keymap-overrides.xml files.Sort(SORT_METHOD_FILE, SORT_ORDER_ASC); for(int fileIndex = 0; fileIndex<files.Size(); ++fileIndex) - success |= LoadKeymap(files[fileIndex]->GetPath()); + { + if (!files[fileIndex]->m_bIsFolder) + success |= LoadKeymap(files[fileIndex]->GetPath()); + } // Load mappings for any HID devices we have connected std::list<CStdString>::iterator it; @@ -453,7 +456,10 @@ bool CButtonTranslator::Load(bool AlwaysLoad) // Sort the list for filesystem based priorities, e.g. 01-keymap.xml, 02-keymap-overrides.xml files.Sort(SORT_METHOD_FILE, SORT_ORDER_ASC); for(int fileIndex = 0; fileIndex<files.Size(); ++fileIndex) - success |= LoadKeymap(files[fileIndex]->GetPath()); + { + if (!files[fileIndex]->m_bIsFolder) + success |= LoadKeymap(files[fileIndex]->GetPath()); + } } } } |