From 86aeaffd4c8185ffb18a6552e95f1def5fbbf7af Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 20 Apr 2016 22:33:06 +0200 Subject: [PATCH] Distinguish between linked und unlinked state for messages --- DStarControl.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/DStarControl.cpp b/DStarControl.cpp index 3bb61c2..413b935 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -489,15 +489,13 @@ void CDStarControl::writeNetwork() LINK_STATUS status = LS_NONE; unsigned char reflector[DSTAR_LONG_CALLSIGN_LENGTH]; - if (m_network != NULL) - m_network->getStatus(status, reflector); - - m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "N", (char*) reflector); - - if (strcmp((char*) reflector, " ") == 0) { - LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s", my1, my2, your); - } else { + m_network->getStatus(status, reflector); + if (status == LS_LINKED_DEXTRA || status == LS_LINKED_DPLUS || status == LS_LINKED_DCS || status == LS_LINKED_CCS || status == LS_LINKED_LOOPBACK) { + m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "N", (char*) reflector); LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s via %8.8s", my1, my2, your, reflector); + } else { + m_display->writeDStar((char*)my1, (char*)my2, (char*)your, "N", (char*) " "); + LogMessage("D-Star, received network header from %8.8s/%4.4s to %8.8s", my1, my2, your); } } else if (type == TAG_EOT) { if (m_netState != RS_NET_AUDIO)