Index: trunk/psModules/src/camera/pmFPAfileDefine.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 14934)
+++ trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 14954)
@@ -190,13 +190,9 @@
     // Use the format we were told to, the format specified in the file rule, or default to the default format
     if (!formatName || strlen(formatName) == 0) {
-        if (fpa && fpa->formatName && strlen(fpa->formatName) > 0) {
-            formatName = (psString)fpa->formatName; // Casting away "const" --- it will be copied, so no prob.
-        } else {
-            // select the format list from the selected camera
-            formatName = psMetadataLookupStr(&status, data, "FILE.FORMAT");
-            if (!formatName || strcmp(formatName, "NONE") == 0) {
-                // Try to get by with the default
-                formatName = config->formatName;
-            }
+        // select the format list from the selected camera
+        formatName = psMetadataLookupStr(&status, data, "FILE.FORMAT");
+        if (!formatName || strcmp(formatName, "NONE") == 0) {
+            // Try to get by with the default
+            formatName = config->formatName;
         }
     }
@@ -250,11 +246,11 @@
         }
     } else {
-	// if we do not have extensions in the file, we are forced to write out at the file level
-	file->dataLevel = file->fileLevel;
-	file->freeLevel = file->fileLevel;
+        // if we do not have extensions in the file, we are forced to write out at the file level
+        file->dataLevel = file->fileLevel;
+        file->freeLevel = file->fileLevel;
     }
 
     psTrace ("psModules.camera", 5, "file: %s, format: %s, fileLevel: %s, extLevel: %s, dataLevel: %s, freeLevel: %s\n",
-	     file->name, file->formatName, pmFPALevelToName (file->fileLevel), pmFPALevelToName(extLevel), pmFPALevelToName (file->dataLevel), pmFPALevelToName (file->freeLevel));
+             file->name, file->formatName, pmFPALevelToName (file->fileLevel), pmFPALevelToName(extLevel), pmFPALevelToName (file->dataLevel), pmFPALevelToName (file->freeLevel));
 
     // add argument-supplied OUTPUT name to this file