Changeset 23283

Timestamp:

Mar 11, 2009, 4:34:43 PM (17 years ago)

Author:

Paul Price

Message:

Cull all recipe overrides from cameras, since they've been placed in the system recipes.

File:

• trunk/psModules/src/config/pmConfigDump.c (modified) (2 diffs)

trunk/psModules/src/config/pmConfigDump.c

@@ -59 +59 @@
         return false;
     }
+    psFree(keep);
 
     // Need to cull recipes from all cameras as well
+    keep = psArrayAllocEmpty(1);
     psMetadata *cameras = psMetadataLookupMetadata(NULL, config->system, "CAMERAS"); // Known cameras
     if (!cameras) {
@@ -77 +79 @@
             continue;
         }
-        if (!configCull(recipes, keep)) {
+        if (!configCull(recipes, NULL)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to cull recipes for camera %s", item->name);
             psFree(iter);
-            psFree(keep);
             return false;
         }
     }
     psFree(iter);
-
-    psFree(keep);
 
     return true;