diff --git a/DCCEXParser.cpp b/DCCEXParser.cpp index 5c0cb84..e554895 100644 --- a/DCCEXParser.cpp +++ b/DCCEXParser.cpp @@ -626,14 +626,19 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream) else { // Turnout * t=Turnout::get(id); if (!t || t->isHidden()) StringFormatter::send(stream, F(" %d X"),id); - else StringFormatter::send(stream, F(" %d %c \"%S\""), - id,t->isThrown()?'T':'C', + else { + const FSH *tdesc = NULL; #ifdef EXRAIL_ACTIVE - RMFT2::getTurnoutDescription(id) -#else - F("") -#endif - ); + tdesc = RMFT2::getTurnoutDescription(id); +#endif + if (tdesc == NULL) + StringFormatter::send(stream, F(" %d %c"), + id,t->isThrown()?'T':'C'); + else + StringFormatter::send(stream, F(" %d %c \"%S\""), + id,t->isThrown()?'T':'C', + tdesc); + } } StringFormatter::send(stream, F(">\n")); return; diff --git a/GITHUB_SHA.h b/GITHUB_SHA.h index 5d48ec7..ba13dba 100644 --- a/GITHUB_SHA.h +++ b/GITHUB_SHA.h @@ -1 +1 @@ -#define GITHUB_SHA "devel-202301271500Z" +#define GITHUB_SHA "devel-202301271742Z" diff --git a/version.h b/version.h index f55e502..4afa186 100644 --- a/version.h +++ b/version.h @@ -4,7 +4,8 @@ #include "StringFormatter.h" -#define VERSION "4.2.11pre1" +#define VERSION "4.2.12pre1" +// 4.2.12 Bugfix for issue #299 TurnoutDescription NULL // 4.2.11 Exrail IFLOCO feature added // 4.2.10 SIGNAL/SIGNALH bug fix as they were inverted // IO_EXIOExpander.h input speed optimisation