diff -r 489ea0becd74 -r 14f634f5b613 tool/CommandCStruct.cpp
--- a/tool/CommandCStruct.cpp	Thu Mar 11 14:29:43 2010 +0100
+++ b/tool/CommandCStruct.cpp	Thu Mar 11 15:03:52 2010 +0100
@@ -70,6 +70,7 @@
 
 void CommandCStruct::execute(const StringVector &args)
 {
+	MasterIndexList masterIndices;
     SlaveList slaves;
     SlaveList::const_iterator si;
 
@@ -79,9 +80,10 @@
         throwInvalidUsageException(err);
     }
 
+	masterIndices = getMasterIndices();
     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);
         slaves = selectedSlaves(m);