From e32bc92498d87fb42829b08348d7fad89bc89404 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 21 Jun 2024 15:28:31 -0400
Subject: [PATCH] G4ParticleMessenger: fix incorrect GetCurrentValue
 implementation for /particle/select

---
 source/particles/management/include/G4ParticleMessenger.hh | 1 -
 source/particles/management/src/G4ParticleMessenger.cc     | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/particles/management/include/G4ParticleMessenger.hh b/source/particles/management/include/G4ParticleMessenger.hh
index 3ce426abf90..f5d6ecac43c 100644
--- a/source/particles/management/include/G4ParticleMessenger.hh
+++ b/source/particles/management/include/G4ParticleMessenger.hh
@@ -94,7 +94,6 @@ class G4ParticleMessenger : public G4UImessenger
     G4UIcmdWithAnInteger* verboseCmd = nullptr;
 
     G4ParticleTable* theParticleTable = nullptr;
-    G4ParticleDefinition* currentParticle = nullptr;
 
     G4ParticlePropertyMessenger* fParticlePropertyMessenger = nullptr;
 };
diff --git a/source/particles/management/src/G4ParticleMessenger.cc b/source/particles/management/src/G4ParticleMessenger.cc
index 93c3d4b6922..fde4a0900a9 100644
--- a/source/particles/management/src/G4ParticleMessenger.cc
+++ b/source/particles/management/src/G4ParticleMessenger.cc
@@ -201,6 +201,7 @@ G4String G4ParticleMessenger::GetCurrentValue(G4UIcommand* command)
     }
     selectCmd->SetCandidates((const char*)(candidates));
 
+    const G4ParticleDefinition* currentParticle = theParticleTable->GetSelectedParticle();
     static const G4String noName("none");
     // current value
     if (currentParticle == nullptr) {