From 30a3cbeece0936f372ca3a81c6c03df3eb6f52f5 Mon Sep 17 00:00:00 2001
From: ivana <ivana@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Tue, 12 Sep 2000 10:09:08 +0000
Subject: [PATCH] corrected redefining of G4VisAttributes

---
 AliGeant4/AliLVStructure.cxx        | 21 +++++++++++++++------
 AliGeant4/AliModuleConstruction.cxx |  9 +++++++--
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/AliGeant4/AliLVStructure.cxx b/AliGeant4/AliLVStructure.cxx
index 7036b82bb4e..5ff84e93084 100644
--- a/AliGeant4/AliLVStructure.cxx
+++ b/AliGeant4/AliLVStructure.cxx
@@ -257,11 +257,16 @@ void AliLVStructure::SetTreeVisibility(G4bool visibility)
   for (G4int i=0; i<fLogicalVolumes.entries(); i++) {
     G4LogicalVolume* lv = fLogicalVolumes(i);
 
-    const G4VisAttributes* kpVisAttributes = lv->GetVisAttributes ();
-    G4Colour colour   = kpVisAttributes->GetColour();
+    const G4VisAttributes* kpVisAttributes = lv->GetVisAttributes();
+    G4VisAttributes* newVisAttributes; 
+    if (kpVisAttributes) {
+      G4Colour colour   = kpVisAttributes->GetColour();
+      newVisAttributes = new G4VisAttributes(colour); 
+    }
+    else
+      newVisAttributes = new G4VisAttributes();
     delete kpVisAttributes;
 
-    G4VisAttributes* newVisAttributes = new G4VisAttributes(colour); 
     newVisAttributes->SetVisibility(visibility); 
 
     lv->SetVisAttributes(newVisAttributes);
@@ -281,11 +286,15 @@ void AliLVStructure::SetTreeColour(G4String colName)
     G4LogicalVolume* lv = fLogicalVolumes(i);
 
     const G4VisAttributes* kpVisAttributes = lv->GetVisAttributes ();
-    G4bool oldVisibility = kpVisAttributes->IsVisible();
+    G4VisAttributes* newVisAttributes; 
+    if (kpVisAttributes) {
+      G4bool oldVisibility = kpVisAttributes->IsVisible();
+      newVisAttributes = new G4VisAttributes(oldVisibility); 
+    }
+    else
+      newVisAttributes = new G4VisAttributes();
     delete kpVisAttributes;
 
-    G4VisAttributes* newVisAttributes = new G4VisAttributes(oldVisibility); 
-
     AliColourStore* pColours = AliColourStore::Instance();
     G4Colour colour = pColours->GetColour(colName);
     newVisAttributes->SetColour(colour);
diff --git a/AliGeant4/AliModuleConstruction.cxx b/AliGeant4/AliModuleConstruction.cxx
index 5e700b49bb6..f4ff387beb5 100644
--- a/AliGeant4/AliModuleConstruction.cxx
+++ b/AliGeant4/AliModuleConstruction.cxx
@@ -281,10 +281,15 @@ void AliModuleConstruction::SetVolumeVisibility(G4LogicalVolume* lv,
 
   if (lv) {
     const G4VisAttributes* kpVisAttributes = lv->GetVisAttributes ();
-    G4Colour oldColour   = kpVisAttributes->GetColour();
+    G4VisAttributes* newVisAttributes; 
+    if (kpVisAttributes) {
+      G4Colour oldColour   = kpVisAttributes->GetColour();
+      newVisAttributes = new G4VisAttributes(oldColour); 
+    }  
+    else
+      newVisAttributes = new G4VisAttributes();
     delete kpVisAttributes;
 
-    G4VisAttributes* newVisAttributes = new G4VisAttributes(oldColour); 
     newVisAttributes->SetVisibility(visibility); 
 
     lv->SetVisAttributes(newVisAttributes);
-- 
2.43.0