From 9b322520b90503ad2b1cbcf9062f8a3d377c7c28 Mon Sep 17 00:00:00 2001 From: James Laird Date: Wed, 22 Feb 2012 14:09:58 +1100 Subject: Fix libdvdnav searching routine for discs with multiple main titles Prevents crashes when attempting to seek/skip within DVDs and DVD ISOs of things like TV shows. --- lib/libdvd/libdvdnav/src/searching.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/libdvd/libdvdnav/src/searching.c b/lib/libdvd/libdvdnav/src/searching.c index 0d3475ed1c..03f1696dfc 100644 --- a/lib/libdvd/libdvdnav/src/searching.c +++ b/lib/libdvd/libdvdnav/src/searching.c @@ -225,13 +225,9 @@ timemapdone: if(found) { length = cell->last_sector - cell->first_sector + 1; - if (target >= length) { - target -= length; - } else { - /* convert the target sector from Cell-relative to absolute physical sector */ - target += cell->first_sector; - break; - } + /* target is in absolute sectors */ + if (target <= cell->last_sector) + break; } else { -- cgit v1.2.3 From d68f7916fb488a9297fc037568d60d1b4c41a152 Mon Sep 17 00:00:00 2001 From: Jim Carroll Date: Wed, 21 Mar 2012 06:29:47 -0400 Subject: Yet Another Deadlock fix. closes 12580 --- xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp b/xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp index d19b32c991..ced6bc9b90 100644 --- a/xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp +++ b/xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp @@ -609,11 +609,15 @@ namespace PYXBMC char *cLine = NULL; if (!PyArg_ParseTuple(args, (char*)"s", &cLine)) return NULL; - PyXBMCGUILock(); - int id = g_windowManager.GetTopMostModalDialogID(); - if (id == WINDOW_INVALID) id = g_windowManager.GetActiveWindow(); - bool ret = g_infoManager.EvaluateBool(cLine,id); - PyXBMCGUIUnlock(); + bool ret; + { + CPyThreadState gilRelease; + CSingleLock gc(g_graphicsContext); + + int id = g_windowManager.GetTopMostModalDialogID(); + if (id == WINDOW_INVALID) id = g_windowManager.GetActiveWindow(); + ret = g_infoManager.EvaluateBool(cLine,id); + } return Py_BuildValue((char*)"b", ret); } -- cgit v1.2.3 From 038ecf1764357439a44fff188b22cd34d52b30b5 Mon Sep 17 00:00:00 2001 From: spiff Date: Wed, 21 Mar 2012 19:29:32 +0100 Subject: fixed: correct the usage of .Equals() .Equals() returns true/false, not the number of differing chars like strcmp --- xbmc/cores/paplayer/CodecFactory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/cores/paplayer/CodecFactory.cpp b/xbmc/cores/paplayer/CodecFactory.cpp index 99a4065be3..bc30c63883 100644 --- a/xbmc/cores/paplayer/CodecFactory.cpp +++ b/xbmc/cores/paplayer/CodecFactory.cpp @@ -120,7 +120,7 @@ ICodec* CodecFactory::CreateCodecDemux(const CStdString& strFile, const CStdStri if( strContent.Equals("audio/mpeg") || strContent.Equals("audio/mp3") ) return new MP3Codec(); - else if (strContent.Left(9).Equals("audio/l16") == 0) + else if (strContent.Left(9).Equals("audio/l16")) { PCMCodec * pcm_codec = new PCMCodec(); pcm_codec->SetMimeParams(strContent); -- cgit v1.2.3 From 311a9aeaf7e7fada18c2d1b8d844f69ad6bf0c1b Mon Sep 17 00:00:00 2001 From: spiff Date: Wed, 21 Mar 2012 21:37:45 +0100 Subject: changed: get rid of the cache map in button translator it prevents writing working code --- xbmc/input/ButtonTranslator.cpp | 16 ---------------- xbmc/input/ButtonTranslator.h | 2 -- 2 files changed, 18 deletions(-) diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp index 7c640db705..63ea6ec515 100644 --- a/xbmc/input/ButtonTranslator.cpp +++ b/xbmc/input/ButtonTranslator.cpp @@ -363,7 +363,6 @@ CButtonTranslator& CButtonTranslator::GetInstance() CButtonTranslator::CButtonTranslator() { - m_baseMap.clear(); m_deviceList.clear(); m_Loaded = false; } @@ -429,17 +428,6 @@ bool CButtonTranslator::Load(bool AlwaysLoad) }; bool success = false; - // 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; - } - - // Else load the standard mappings - else { for(unsigned int dirIndex = 0; dirIndex < sizeof(DIRS_TO_CHECK)/sizeof(DIRS_TO_CHECK[0]); ++dirIndex) { if( XFILE::CDirectory::Exists(DIRS_TO_CHECK[dirIndex]) ) @@ -485,10 +473,6 @@ bool CButtonTranslator::Load(bool AlwaysLoad) CLog::Log(LOGERROR, "CButtonTranslator::Load - unable to load remote map %s", REMOTEMAP); // don't return false - it is to only indicate a fatal error (which this is not) #endif - - // Standard mappings have been loaded into m_translatorMap, copy them to - // m_baseMap for future reuse. - m_baseMap = m_translatorMap; } // Load mappings for any HID devices we have connected diff --git a/xbmc/input/ButtonTranslator.h b/xbmc/input/ButtonTranslator.h index 802f16bfff..0a8cec7ce7 100644 --- a/xbmc/input/ButtonTranslator.h +++ b/xbmc/input/ButtonTranslator.h @@ -101,8 +101,6 @@ public: private: typedef std::multimap buttonMap; // our button map to fill in - // m_baseMap contains all the standard mappings - std::map m_baseMap; // m_translatorMap contains all mappings i.e. m_BaseMap + HID device mappings std::map m_translatorMap; // m_deviceList contains the list of connected HID devices -- cgit v1.2.3 From d681bb2142493800333605d796d7af4b33039751 Mon Sep 17 00:00:00 2001 From: elupus Date: Wed, 21 Mar 2012 21:38:59 +0100 Subject: fixed: make sure we find the correct cell when we search for the requested time cells in a pgc doesn't need to have continous sectors --- lib/libdvd/libdvdnav/src/searching.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/libdvd/libdvdnav/src/searching.c b/lib/libdvd/libdvdnav/src/searching.c index 03f1696dfc..ed66bf4d99 100644 --- a/lib/libdvd/libdvdnav/src/searching.c +++ b/lib/libdvd/libdvdnav/src/searching.c @@ -224,9 +224,8 @@ timemapdone: if(found) { - length = cell->last_sector - cell->first_sector + 1; - /* target is in absolute sectors */ - if (target <= cell->last_sector) + if (target >= cell->first_sector + && target <= cell->last_sector) break; } else { -- cgit v1.2.3 From fc5aa5af1d94e676f579050bf3696cb0f6405a99 Mon Sep 17 00:00:00 2001 From: theuni Date: Wed, 21 Mar 2012 16:19:44 -0400 Subject: release: sync tmdb that was missed. fixes #12713 --- .../resources/language/Chinese (Simple)/strings.xml | 6 +++++- addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml | 2 +- .../metadata.themoviedb.org/resources/language/English/strings.xml | 4 ++-- .../metadata.themoviedb.org/resources/language/Finnish/strings.xml | 4 ++-- .../metadata.themoviedb.org/resources/language/German/strings.xml | 2 +- .../resources/language/Hungarian/strings.xml | 4 ++-- .../metadata.themoviedb.org/resources/language/Swedish/strings.xml | 2 +- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml b/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml index 247c657fd7..e7151afdc7 100644 --- a/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml @@ -1,5 +1,9 @@  启用同人画 - 启用HD-Trailers.net预告片 + 首选HD-Trailers.net预告片 + 首选语言 + 获取评价信息于 + 启用预告片（YouTube） + 保留原片名 diff --git a/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml b/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml index 78c768563d..7711a7feda 100644 --- a/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml @@ -1,7 +1,7 @@ Fanart inschakelen - Trailer inschakelen (HD-Trailers.net) + Trailers van HD-Trailers.net inschakelen Voorkeurstaal Verkrijg waardering van IMDb Trailer inschakelen (YouTube) diff --git a/addons/metadata.themoviedb.org/resources/language/English/strings.xml b/addons/metadata.themoviedb.org/resources/language/English/strings.xml index 7efd3a3b72..d61eda00f5 100644 --- a/addons/metadata.themoviedb.org/resources/language/English/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/English/strings.xml @@ -2,8 +2,8 @@ Enable Fanart Enable Trailer (YouTube) - Enable Trailer (HD-Trailers.net) + Prefer Trailer from HD-Trailers.net Preferred language - Get rating from IMDb + Get rating from Keep Original Title diff --git a/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml index 2e7122283b..ab425a5364 100644 --- a/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml @@ -1,8 +1,8 @@ Fanitaide käytössä - Trailerit käytössä (YouTube) - Trailerit käytössä (HD-Trailers.net) + Trailerit käytössä + Valitse ensisijaisesti trailerit HD-Trailers.net -sivustolta Ensisijainen kieli Hae arvosana IMDb:stä Näytä alkuperäinen nimi diff --git a/addons/metadata.themoviedb.org/resources/language/German/strings.xml b/addons/metadata.themoviedb.org/resources/language/German/strings.xml index c09cbb48f8..a3ae5113f8 100644 --- a/addons/metadata.themoviedb.org/resources/language/German/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/German/strings.xml @@ -1,7 +1,7 @@ Aktiviere Fanart - Aktiviere Trailer (HD-Trailers.net) + Aktiviere Trailer von HD-Trailers.net Bevorzugte Sprache Bewertung von IMDb nutzen Aktiviere Trailer (YouTube) diff --git a/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml index aac4afcabb..d5e3f07af5 100644 --- a/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml @@ -2,8 +2,8 @@ Fanartképek engedélyezése Filmelőzetesek engedélyezése (YouTube) - Filmelőzetesek engedélyezése (HD-Trailers.net) + Filmelőzetesek inkább a HD-Trailers.net-ről Preferált nyelv - Értékelés az IMDb-ről + Értékelés letöltése innen Eredeti filmcím megtartása diff --git a/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml index 4beab0fe34..59406fddd9 100644 --- a/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml @@ -6,7 +6,7 @@ Aktivera fanart - Aktivera trailers (HD-Trailers.net) + Aktivera trailers från HD-Trailers.net Föredraget språk Hämta betyg från IMDb Aktivera trailers (YouTube) -- cgit v1.2.3 From cc344423dcb353504502ecc17af29d88d47f202c Mon Sep 17 00:00:00 2001 From: spiff Date: Wed, 21 Mar 2012 21:43:14 +0100 Subject: fixed: load HID keymaps in proper priority order --- xbmc/input/ButtonTranslator.cpp | 42 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp index 63ea6ec515..012422ee15 100644 --- a/xbmc/input/ButtonTranslator.cpp +++ b/xbmc/input/ButtonTranslator.cpp @@ -440,6 +440,25 @@ bool CButtonTranslator::Load(bool AlwaysLoad) for(int fileIndex = 0; fileIndexGetPath().Right(4) == ".xml") success |= LoadKeymap(files[fileIndex]->GetPath()); + + // Load mappings for any HID devices we have connected + std::list::iterator it; + for (it = m_deviceList.begin(); it != m_deviceList.end(); it++) + { + CStdString devicedir = DIRS_TO_CHECK[dirIndex]; + devicedir.append(*it); + devicedir.append("/"); + if( XFILE::CDirectory::Exists(devicedir) ) + { + CFileItemList files; + XFILE::CDirectory::GetDirectory(devicedir, files, "*.xml"); + // 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; fileIndexGetPath().Right(4) == ".xml") + success |= LoadKeymap(files[fileIndex]->GetPath()); + } + } } } @@ -475,29 +494,6 @@ bool CButtonTranslator::Load(bool AlwaysLoad) #endif } - // Load mappings for any HID devices we have connected - std::list::iterator it; - for (it = m_deviceList.begin(); it != m_deviceList.end(); it++) - { - for(unsigned int dirIndex = 0; dirIndex < sizeof(DIRS_TO_CHECK)/sizeof(DIRS_TO_CHECK[0]); ++dirIndex) - { - CStdString devicedir = DIRS_TO_CHECK[dirIndex]; - devicedir.append(*it); - devicedir.append("/"); - if( XFILE::CDirectory::Exists(devicedir) ) - { - CFileItemList files; - XFILE::CDirectory::GetDirectory(devicedir, files, "*.xml"); - // Sort the list for filesystem based priorities, e.g. 01-keymap.xml, 02-keymap-overrides.xml - files.Sort(SORT_METHOD_FILE, SORT_ORDER_ASC); - // In (at least) Windows the GetDirectory returns all files not just *.xml files - for(int fileIndex = 0; fileIndexGetPath().Right(4) == ".xml") - success |= LoadKeymap(files[fileIndex]->GetPath()); - } - } - } - // Done! m_Loaded = true; return true; -- cgit v1.2.3 From 6e3bfa012d43cf5eb9ebdfa528fc2ea224c31ca6 Mon Sep 17 00:00:00 2001 From: spiff Date: Wed, 21 Mar 2012 21:23:25 +0100 Subject: fixed: specify mask correctly instead of playing silly games --- xbmc/input/ButtonTranslator.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp index 012422ee15..13304a0bcb 100644 --- a/xbmc/input/ButtonTranslator.cpp +++ b/xbmc/input/ButtonTranslator.cpp @@ -433,13 +433,11 @@ bool CButtonTranslator::Load(bool AlwaysLoad) if( XFILE::CDirectory::Exists(DIRS_TO_CHECK[dirIndex]) ) { CFileItemList files; - XFILE::CDirectory::GetDirectory(DIRS_TO_CHECK[dirIndex], files, "*.xml"); + XFILE::CDirectory::GetDirectory(DIRS_TO_CHECK[dirIndex], files, ".xml"); // Sort the list for filesystem based priorities, e.g. 01-keymap.xml, 02-keymap-overrides.xml files.Sort(SORT_METHOD_FILE, SORT_ORDER_ASC); - // In (at least) Windows the GetDirectory returns all files not just *.xml files for(int fileIndex = 0; fileIndexGetPath().Right(4) == ".xml") - success |= LoadKeymap(files[fileIndex]->GetPath()); + success |= LoadKeymap(files[fileIndex]->GetPath()); // Load mappings for any HID devices we have connected std::list::iterator it; @@ -451,12 +449,11 @@ bool CButtonTranslator::Load(bool AlwaysLoad) if( XFILE::CDirectory::Exists(devicedir) ) { CFileItemList files; - XFILE::CDirectory::GetDirectory(devicedir, files, "*.xml"); + XFILE::CDirectory::GetDirectory(devicedir, files, ".xml"); // 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; fileIndexGetPath().Right(4) == ".xml") - success |= LoadKeymap(files[fileIndex]->GetPath()); + success |= LoadKeymap(files[fileIndex]->GetPath()); } } } -- cgit v1.2.3 From ce1bb1579888b92351d388352e547643d047e076 Mon Sep 17 00:00:00 2001 From: spiff Date: Wed, 21 Mar 2012 21:46:23 +0100 Subject: cosmetics --- xbmc/input/ButtonTranslator.cpp | 61 ++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp index 13304a0bcb..c403237470 100644 --- a/xbmc/input/ButtonTranslator.cpp +++ b/xbmc/input/ButtonTranslator.cpp @@ -428,16 +428,16 @@ bool CButtonTranslator::Load(bool AlwaysLoad) }; bool success = false; + for (unsigned int dirIndex = 0; dirIndex < sizeof(DIRS_TO_CHECK)/sizeof(DIRS_TO_CHECK[0]); ++dirIndex) { - for(unsigned int dirIndex = 0; dirIndex < sizeof(DIRS_TO_CHECK)/sizeof(DIRS_TO_CHECK[0]); ++dirIndex) { - if( XFILE::CDirectory::Exists(DIRS_TO_CHECK[dirIndex]) ) - { - CFileItemList files; - XFILE::CDirectory::GetDirectory(DIRS_TO_CHECK[dirIndex], files, ".xml"); - // 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; fileIndexGetPath()); + if (XFILE::CDirectory::Exists(DIRS_TO_CHECK[dirIndex])) + { + CFileItemList files; + XFILE::CDirectory::GetDirectory(DIRS_TO_CHECK[dirIndex], files, ".xml"); + // 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; fileIndexGetPath()); // Load mappings for any HID devices we have connected std::list::iterator it; @@ -456,14 +456,14 @@ bool CButtonTranslator::Load(bool AlwaysLoad) success |= LoadKeymap(files[fileIndex]->GetPath()); } } - } } + } - if (!success) - { - CLog::Log(LOGERROR, "Error loading keymaps from: %s or %s or %s", DIRS_TO_CHECK[0], DIRS_TO_CHECK[1], DIRS_TO_CHECK[2]); - return false; - } + if (!success) + { + CLog::Log(LOGERROR, "Error loading keymaps from: %s or %s or %s", DIRS_TO_CHECK[0], DIRS_TO_CHECK[1], DIRS_TO_CHECK[2]); + return false; + } #if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE) #ifdef _LINUX @@ -471,25 +471,24 @@ bool CButtonTranslator::Load(bool AlwaysLoad) #else #define REMOTEMAP "IRSSmap.xml" #endif - CStdString lircmapPath; - URIUtils::AddFileToFolder("special://xbmc/system/", REMOTEMAP, lircmapPath); - lircRemotesMap.clear(); - if(CFile::Exists(lircmapPath)) - success |= LoadLircMap(lircmapPath); - else - CLog::Log(LOGDEBUG, "CButtonTranslator::Load - no system %s found, skipping", REMOTEMAP); + CStdString lircmapPath; + URIUtils::AddFileToFolder("special://xbmc/system/", REMOTEMAP, lircmapPath); + lircRemotesMap.clear(); + if(CFile::Exists(lircmapPath)) + success |= LoadLircMap(lircmapPath); + else + CLog::Log(LOGDEBUG, "CButtonTranslator::Load - no system %s found, skipping", REMOTEMAP); - lircmapPath = g_settings.GetUserDataItem(REMOTEMAP); - if(CFile::Exists(lircmapPath)) - success |= LoadLircMap(lircmapPath); - else - CLog::Log(LOGDEBUG, "CButtonTranslator::Load - no userdata %s found, skipping", REMOTEMAP); + lircmapPath = g_settings.GetUserDataItem(REMOTEMAP); + if(CFile::Exists(lircmapPath)) + success |= LoadLircMap(lircmapPath); + else + CLog::Log(LOGDEBUG, "CButtonTranslator::Load - no userdata %s found, skipping", REMOTEMAP); - if (!success) - CLog::Log(LOGERROR, "CButtonTranslator::Load - unable to load remote map %s", REMOTEMAP); - // don't return false - it is to only indicate a fatal error (which this is not) + if (!success) + CLog::Log(LOGERROR, "CButtonTranslator::Load - unable to load remote map %s", REMOTEMAP); + // don't return false - it is to only indicate a fatal error (which this is not) #endif - } // Done! m_Loaded = true; -- cgit v1.2.3 From 0406f1b855011eb272238d3822191ba09a74069c Mon Sep 17 00:00:00 2001 From: Jonathan Marshall Date: Thu, 22 Mar 2012 10:57:14 +1300 Subject: a folder isn't a keymap --- xbmc/input/ButtonTranslator.cpp | 10 ++++++++-- 1 file 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; fileIndexGetPath()); + { + if (!files[fileIndex]->m_bIsFolder) + success |= LoadKeymap(files[fileIndex]->GetPath()); + } // Load mappings for any HID devices we have connected std::list::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; fileIndexGetPath()); + { + if (!files[fileIndex]->m_bIsFolder) + success |= LoadKeymap(files[fileIndex]->GetPath()); + } } } } -- cgit v1.2.3