From c8df51a8b3b510fa05ee4477274d16e81b90f3ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= Date: Tue, 2 Apr 2019 19:50:01 +0200 Subject: [PATCH] Fix {ctype} sign macro displaying Empty for non-element ctypes --- src/simulation/Sign.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/simulation/Sign.cpp b/src/simulation/Sign.cpp index d4e92f439..624aa4921 100644 --- a/src/simulation/Sign.cpp +++ b/src/simulation/Sign.cpp @@ -116,11 +116,11 @@ String sign::getText(Simulation *sim) } else if (between_curlies == "type") { - formatted_text << (part ? sim->BasicParticleInfo(*part) : (formatted_text.Size() ? String::Build("empty") : String::Build("Empty"))); + formatted_text << (part ? sim->BasicParticleInfo(*part) : (formatted_text.Size() ? "empty" : "Empty")); } else if (between_curlies == "ctype") { - formatted_text << ((part && part->ctype && sim->IsValidElement(part->ctype)) ? sim->ElementResolve(part->ctype, -1) : (formatted_text.Size() ? String::Build("empty") : String::Build("Empty"))); + formatted_text << (part ? ((part->ctype && sim->IsValidElement(part->ctype)) ? sim->ElementResolve(part->ctype, -1) : String::Build(part->ctype)) : (formatted_text.Size() ? "empty" : "Empty")); } else if (between_curlies == "life") {