Changeset 30824 for trunk/psModules/src/config/pmConfigRecipeValue.c

Timestamp:

Mar 8, 2011, 4:24:20 PM (15 years ago)

Author:

watersc1

Message:

I strongly suspect that the reason Heather wasn't reading the correct values was that I forgot to commit this.

File:

• trunk/psModules/src/config/pmConfigRecipeValue.c (modified) (1 diff)

trunk/psModules/src/config/pmConfigRecipeValue.c

@@ -32 +32 @@
         return NULL;
     }
-
-    psMetadataItem *fpaItem = psMetadataLookup(recipe, valueName); // Value for FPA or menu of chips
+    psMetadata *format = config->format;
+    
+    psMetadataItem *fpaItem;
+    fpaItem = psMetadataLookup(format, valueName);
+    if (!fpaItem) {
+      fpaItem = psMetadataLookup(recipe, valueName); // Value for FPA or menu of chips
+    }
+    
     if (!fpaItem) {
         psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find value %s in recipe %s", valueName, recipeName);