Merge branch 'master' into devel

clean result from invalid <JR n>
2024-11-24 16:46:13 +01:00 · 2023-10-12 11:07:39 +01:00 · 2023-10-12 11:07:05 +01:00
1 changed files with 9 additions and 5 deletions
--- a/DCCEXParser.cpp
+++ b/DCCEXParser.cpp
@ -805,11 +805,15 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
                    SENDFLASHLIST(stream,RMFT2::rosterIdList)
                }
                else {
-		  const FSH * functionNames= RMFT2::getRosterFunctions(id);
-		  StringFormatter::send(stream,F(" %d \"%S\" \"%S\""), 
-					id, RMFT2::getRosterName(id),
-					functionNames == NULL ? RMFT2::getRosterFunctions(0) : functionNames);
-		}
+                    auto rosterName= RMFT2::getRosterName(id);
+                    if (!rosterName) rosterName=F("");
+
+                    auto functionNames= RMFT2::getRosterFunctions(id);
+                    if (!functionNames) functionNames=RMFT2::getRosterFunctions(0);
+                    if (!functionNames) functionNames=F("");
+                    StringFormatter::send(stream,F(" %d \"%S\" \"%S\""), 
+					                            id, rosterName, functionNames);
+                }
 #endif          
                StringFormatter::send(stream, F(">\n"));      
                return;
Author	SHA1	Message	Date
Asbelos	7db4a9575a	Merge branch 'master' into devel	2023-10-12 11:07:39 +01:00
Asbelos	8b8e9e4919	clean result from invalid <JR n>	2023-10-12 11:07:05 +01:00