Changeset 27077 for trunk/ppSub/src/ppSub.c

Timestamp:

Feb 25, 2010, 11:24:32 AM (16 years ago)

Author:

Paul Price

Message:

Reorganising the death to ensure files are closed.

File:

• trunk/ppSub/src/ppSub.c (modified) (3 diffs)

trunk/ppSub/src/ppSub.c

@@ -63 +63 @@
 
  die:
-    psTrace("ppSub", 1, "Finished at %f sec\n", psTimerMark("ppSub"));
-    psTimerStop();
-
     if (data && data->stats && data->statsFile) {
         psString stats = psMetadataConfigFormat(data->stats); // Statistics to output
@@ -90 +87 @@
         psFree(data);
     }
-
-    pmVisualClose(); //close plot windows, if -visual is set
-    pmModelClassCleanup();
-    pmConfigDone();
-    psLibFinalize();
 
     psExit exitValue = PS_EXIT_SUCCESS;        // Exit value for program
@@ -136 +128 @@
     }
 
+    if (config && !ppSubFilesIterateUp(config, PPSUB_FILES_ALL)) {
+        psErrorStackPrint(stderr, "Unable to close files.");
+    }
+
+    psTrace("ppSub", 1, "Finished at %f sec\n", psTimerMark("ppSub"));
+    psTimerStop();
+
+    pmVisualClose(); //close plot windows, if -visual is set
+    pmModelClassCleanup();
+    pmConfigDone();
+    psLibFinalize();
+
     exit(exitValue);
 }