When looking for plugins in a search dir, make sure the path is correct

11 years ago · c23d198923
parent 869483055c
commit c23d198923
1 changed files with 2 additions and 3 deletions
--- 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
                {