Only set atomic bool to true once

Nicolas Koehlerrequested to merge
nkoehler/athena:msgAtomic into master

Hi,

this MR is a follow-up of !38437 (merged) with some cleanup.

Best, Nico

Merge request reports