From a9870fe88f0c6de557e645f2555dd0545f38dba7 Mon Sep 17 00:00:00 2001
From: rgrosso <rgrosso@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Tue, 7 Apr 2009 12:45:25 +0000
Subject: [PATCH] protection against attempt to load a new geometry when
 current one is locked

---
 STEER/AliGeomManager.cxx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/STEER/AliGeomManager.cxx b/STEER/AliGeomManager.cxx
index 21c4095729c..e29a817dbec 100644
--- a/STEER/AliGeomManager.cxx
+++ b/STEER/AliGeomManager.cxx
@@ -111,6 +111,12 @@ void AliGeomManager::LoadGeometry(const char *geomFileName)
   // Load geometry either from a file
   // or from the corresponding CDB entry
 
+  if(fgGeometry->IsLocked()){
+      AliErrorClass("Cannot load a new geometry, the current one being locked. Setting internal geometry to null!!");
+      fgGeometry = NULL;
+      return;
+  }
+
   fgGeometry = NULL;
   if (geomFileName && (!gSystem->AccessPathName(geomFileName))) {
     fgGeometry = TGeoManager::Import(geomFileName);
-- 
2.43.0