From 90d781cd3a38f7fa4a62f7ba69f249362cee7c95 Mon Sep 17 00:00:00 2001
From: TJ Khoo <khoo@cern.ch>
Date: Fri, 7 Dec 2018 21:05:36 +0100
Subject: [PATCH] Simplify handling of NumThreads=0 in MainServicesConfig

---
 Control/AthenaConfiguration/python/MainServicesConfig.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Control/AthenaConfiguration/python/MainServicesConfig.py b/Control/AthenaConfiguration/python/MainServicesConfig.py
index da46005306b..8de68521775 100644
--- a/Control/AthenaConfiguration/python/MainServicesConfig.py
+++ b/Control/AthenaConfiguration/python/MainServicesConfig.py
@@ -61,11 +61,12 @@ def MainServicesSerialCfg(LoopMgr='AthenaEventLoopMgr'):
 def MainServicesThreadedCfg(cfgFlags):
     # Neater ways to set the loop manager? Can't be altered
     # after setting up the 
-    cfg = MainServicesSerialCfg("AthenaHiveEventLoopMgr")
 
     # Run a serial job for threads=0
     if cfgFlags.Concurrency.NumThreads==0:
-        return cfg
+        return MainServicesSerialCfg()
+
+    cfg = MainServicesSerialCfg("AthenaHiveEventLoopMgr")
 
     # Migrated code from AtlasThreadedJob.py
     from GaudiCoreSvc.GaudiCoreSvcConf import MessageSvc
-- 
GitLab