load controller XML and JS module files from subdirectories

mixxxdj · Jun 15, 2020 · ce22c15 · ce22c15
1 parent 020bd0d
commit ce22c15
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/controllers/controllerpresetfilehandler.cpp b/src/controllers/controllerpresetfilehandler.cpp
@@ -146,7 +146,7 @@ void ControllerPresetFileHandler::addScriptFilesToPreset(
     }
 
     QString moduleFileName = controller.firstChildElement("module").text();
-    preset->setModuleFileInfo(findScriptFile(preset, moduleFileName, systemPresetsPath));
+    preset->setModuleFileInfo(preset->dirPath().absoluteFilePath(moduleFileName));
 }
 
 bool ControllerPresetFileHandler::writeDocument(

diff --git a/src/controllers/controllerpresetinfoenumerator.cpp b/src/controllers/controllerpresetinfoenumerator.cpp
@@ -57,7 +57,7 @@ void PresetInfoEnumerator::loadSupportedPresets() {
     m_bulkPresets.clear();
 
     for (const QString& dirPath : m_controllerDirPaths) {
-        QDirIterator it(dirPath);
+        QDirIterator it(dirPath, QDirIterator::Subdirectories);
         while (it.hasNext()) {
             it.next();
             const QString path = it.filePath();