From 0da70a1aba4dd47c15a8ca279ccb618132a1ecab Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Tue, 18 Oct 2016 17:12:43 -0700 Subject: [PATCH] Fix add-on button map overriding user button map --- src/storage/StorageManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/storage/StorageManager.cpp b/src/storage/StorageManager.cpp index b7a0a88a..336d7563 100644 --- a/src/storage/StorageManager.cpp +++ b/src/storage/StorageManager.cpp @@ -89,10 +89,10 @@ bool CStorageManager::Initialize(ADDON::CHelper_libKODI_peripheral* peripheralLi // Ensure button map path exists in user data CStorageUtils::EnsureDirectoryExists(strUserButtonMapPath); - m_databases.push_back(DatabasePtr(new CDatabaseXml(strUserButtonMapPath, true, m_buttonMapper->GetCallbacks()))); - //m_databases.push_back(DatabasePtr(new CDatabaseRetroArch(strUserButtonMapPath, true, &m_controllerMapper))); // TODO - m_databases.push_back(DatabasePtr(new CDatabaseXml(strAddonButtonMapPath, false, m_buttonMapper->GetCallbacks()))); //m_databases.push_back(DatabasePtr(new CDatabaseRetroArch(strAddonButtonMapPath, false))); // TODO + m_databases.push_back(DatabasePtr(new CDatabaseXml(strAddonButtonMapPath, false, m_buttonMapper->GetCallbacks()))); + //m_databases.push_back(DatabasePtr(new CDatabaseRetroArch(strUserButtonMapPath, true, &m_controllerMapper))); // TODO + m_databases.push_back(DatabasePtr(new CDatabaseXml(strUserButtonMapPath, true, m_buttonMapper->GetCallbacks()))); m_databases.push_back(DatabasePtr(new CDatabaseJoystickAPI(m_buttonMapper->GetCallbacks())));