(Android) Fixed an issue where the wrong system configuration files were selected

This commit is contained in:
Leon Styhre 2023-12-19 17:58:12 +01:00
parent 8ab3697c10
commit 9b96e4b69f

View file

@ -49,12 +49,12 @@ void FindRules::loadFindRules()
LOG(LogInfo) << "Found custom find rules configuration file"; LOG(LogInfo) << "Found custom find rules configuration file";
} }
#if defined(__linux__) #if defined(__ANDROID__)
filePath =
ResourceManager::getInstance().getResourcePath(":/systems/linux/es_find_rules.xml", false);
#elif defined(__ANDROID__)
filePath = ResourceManager::getInstance().getResourcePath(":/systems/android/es_find_rules.xml", filePath = ResourceManager::getInstance().getResourcePath(":/systems/android/es_find_rules.xml",
false); false);
#elif defined(__linux__)
filePath =
ResourceManager::getInstance().getResourcePath(":/systems/linux/es_find_rules.xml", false);
#elif defined(_WIN64) #elif defined(_WIN64)
filePath = ResourceManager::getInstance().getResourcePath(":/systems/windows/es_find_rules.xml", filePath = ResourceManager::getInstance().getResourcePath(":/systems/windows/es_find_rules.xml",
false); false);
@ -976,10 +976,10 @@ std::vector<std::string> SystemData::getConfigPath()
paths.emplace_back(path); paths.emplace_back(path);
} }
#if defined(__linux__) #if defined(__ANDROID__)
path = ResourceManager::getInstance().getResourcePath(":/systems/linux/es_systems.xml", true);
#elif defined(__ANDROID__)
path = ResourceManager::getInstance().getResourcePath(":/systems/android/es_systems.xml", true); path = ResourceManager::getInstance().getResourcePath(":/systems/android/es_systems.xml", true);
#elif defined(__linux__)
path = ResourceManager::getInstance().getResourcePath(":/systems/linux/es_systems.xml", true);
#elif defined(_WIN64) #elif defined(_WIN64)
path = ResourceManager::getInstance().getResourcePath(":/systems/windows/es_systems.xml", true); path = ResourceManager::getInstance().getResourcePath(":/systems/windows/es_systems.xml", true);
#elif defined(__APPLE__) #elif defined(__APPLE__)