From c23d198923f67fc66fa68d5802d2c98d610f5ba2 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Tue, 24 Jun 2014 16:27:23 +0200 Subject: [PATCH] When looking for plugins in a search dir, make sure the path is correct --- src/calamares/ModuleLoader.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/calamares/ModuleLoader.cpp b/src/calamares/ModuleLoader.cpp index 1e00a8162..564aa69b9 100644 --- a/src/calamares/ModuleLoader.cpp +++ b/src/calamares/ModuleLoader.cpp @@ -70,8 +70,9 @@ ModuleLoader::doWork() QStringList subdirs = currentDir.entryList( QDir::AllDirs | QDir::NoDotAndDotDot ); foreach ( const QString& subdir, subdirs ) { + currentDir.setPath( path ); bool success = currentDir.cd( subdir ); - if ( success && currentDir.isReadable() ) + if ( success ) { QFileInfo metadataFileInfo( currentDir.absoluteFilePath( MODULE_CONFIG_FILENAME ) ); if ( ! ( metadataFileInfo.exists() && metadataFileInfo.isReadable() ) ) @@ -89,8 +90,6 @@ ModuleLoader::doWork() { m_availableModules.insert( moduleInfo->name(), moduleInfo ); } - - currentDir.cdUp(); } else {