From 180c59fbe224f90d2c072cdf42d125147ff24a7f Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 13 Jun 2013 14:13:10 +0100
Subject: [PATCH] BUG: argList: parRunControl_ destruction order (since does
 Pstream::exit)

---
 src/OpenFOAM/global/argList/argList.C | 4 ++--
 src/OpenFOAM/global/argList/argList.H | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index b75a8864ad..d3c021d4cb 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -473,14 +473,14 @@ Foam::argList::argList
     bool initialise
 )
 :
+    parRunControl_(args.parRunControl_),
     args_(args.args_),
     options_(options),
     executable_(args.executable_),
     rootPath_(args.rootPath_),
     globalCase_(args.globalCase_),
     case_(args.case_),
-    argListStr_(args.argListStr_),
-    parRunControl_(args.parRunControl_)
+    argListStr_(args.argListStr_)
 {
     parse(checkArgs, checkOpts, initialise);
 }
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index c7e07026bd..ed4b07e205 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -105,6 +105,10 @@ class argList
     // Private data
         static bool bannerEnabled;
 
+        //- Switch on/off parallel mode. Has to be first to be constructed
+        //  so destructor is done last.
+        ParRunControl parRunControl_;
+
         stringList args_;
         HashTable<string> options_;
 
@@ -114,8 +118,6 @@ class argList
         fileName case_;
         string argListStr_;
 
-        ParRunControl parRunControl_;
-
         // Signal handlers
         sigFpe sigFpe_;
         sigInt sigInt_;