From a64de3dbfe74233c66ededaaa501b1e708389cc1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 18 Jun 2018 10:29:30 -0400 Subject: [PATCH] [libcalamaresui] Assign the index to found - Previous code assigns the result of the comparison to found, instead of the index, resulting in the wrong configuration map sent to each module. --- src/libcalamaresui/modulesystem/ModuleManager.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp index 6d13c9564..9c3345a73 100644 --- a/src/libcalamaresui/modulesystem/ModuleManager.cpp +++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp @@ -218,7 +218,9 @@ ModuleManager::loadModules() if ( moduleName != instanceId ) //means this is a custom instance { - if ( int found = findCustomInstance( customInstances, moduleName, instanceId ) > -1 ) + int found = findCustomInstance( customInstances, moduleName, instanceId ); + + if ( found > -1 ) { configFileName = customInstances[ found ].value( "config" ); }