From 9b96e4b69f6004d479ef6b46849952fc5b68aed9 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Tue, 19 Dec 2023 17:58:12 +0100 Subject: [PATCH] (Android) Fixed an issue where the wrong system configuration files were selected --- es-app/src/SystemData.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/es-app/src/SystemData.cpp b/es-app/src/SystemData.cpp index 6a44bb396..c6e3cebf6 100644 --- a/es-app/src/SystemData.cpp +++ b/es-app/src/SystemData.cpp @@ -49,12 +49,12 @@ void FindRules::loadFindRules() LOG(LogInfo) << "Found custom find rules configuration file"; } -#if defined(__linux__) - filePath = - ResourceManager::getInstance().getResourcePath(":/systems/linux/es_find_rules.xml", false); -#elif defined(__ANDROID__) +#if defined(__ANDROID__) filePath = ResourceManager::getInstance().getResourcePath(":/systems/android/es_find_rules.xml", false); +#elif defined(__linux__) + filePath = + ResourceManager::getInstance().getResourcePath(":/systems/linux/es_find_rules.xml", false); #elif defined(_WIN64) filePath = ResourceManager::getInstance().getResourcePath(":/systems/windows/es_find_rules.xml", false); @@ -976,10 +976,10 @@ std::vector SystemData::getConfigPath() paths.emplace_back(path); } -#if defined(__linux__) - path = ResourceManager::getInstance().getResourcePath(":/systems/linux/es_systems.xml", true); -#elif defined(__ANDROID__) +#if defined(__ANDROID__) 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) path = ResourceManager::getInstance().getResourcePath(":/systems/windows/es_systems.xml", true); #elif defined(__APPLE__)