Open master device as late as possible.

This commit is contained in:
Florian Pose
2010-03-11 15:03:52 +01:00
parent fb8a75570d
commit ddaee8a1fc
27 changed files with 154 additions and 107 deletions
+6 -4
View File
@@ -104,8 +104,9 @@ string CommandConfig::helpString() const
*/
void CommandConfig::execute(const StringVector &args)
{
ConfigList configs;
MasterIndexList masterIndices;
bool doIndent;
ConfigList configs;
if (args.size()) {
stringstream err;
@@ -113,10 +114,11 @@ void CommandConfig::execute(const StringVector &args)
throwInvalidUsageException(err);
}
doIndent = getMasterIndices().size() > 1;
masterIndices = getMasterIndices();
doIndent = masterIndices.size() > 1;
MasterIndexList::const_iterator mi;
for (mi = getMasterIndices().begin();
mi != getMasterIndices().end(); mi++) {
for (mi = masterIndices.begin();
mi != masterIndices.end(); mi++) {
MasterDevice m(*mi);
m.open(MasterDevice::Read);
configs = selectedConfigs(m);