From d6160f7b7aa0afd6bed627c434b65bdf97f38dd0 Mon Sep 17 00:00:00 2001
From: lwvmobile <lwvmobile@gmail.com>
Date: Wed, 15 Nov 2023 12:30:01 -0500
Subject: [PATCH] NXDN - Zero TG/RID on TX_REL; Misc;

---
 src/dsd_main.c     | 4 ++--
 src/dsd_ncurses.c  | 4 ++--
 src/dsd_symbol.c   | 2 +-
 src/nxdn_element.c | 7 +++++++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/dsd_main.c b/src/dsd_main.c
index fa40667..58174be 100644
--- a/src/dsd_main.c
+++ b/src/dsd_main.c
@@ -2255,9 +2255,9 @@ main (int argc, char **argv)
             opts.frame_provoice = 0;
             opts.frame_ysf = 0;
             opts.frame_m17 = 0;
-            opts.mod_c4fm = 0;
+            opts.mod_c4fm = 1;
             opts.mod_qpsk = 0;
-            opts.mod_gfsk = 1;
+            opts.mod_gfsk = 0;
             state.rf_mod = 0;
             opts.pulse_digi_rate_out = 8000;
             opts.pulse_digi_out_channels = 1;
diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
index 7202b33..9c7f240 100644
--- a/src/dsd_ncurses.c
+++ b/src/dsd_ncurses.c
@@ -1546,9 +1546,9 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
       opts->frame_provoice = 0;
       opts->frame_ysf = 0;
       opts->frame_m17 = 0;
-      opts->mod_c4fm = 0;
+      opts->mod_c4fm = 1;
       opts->mod_qpsk = 0;
-      opts->mod_gfsk = 1;
+      opts->mod_gfsk = 0;
       state->rf_mod = 0;
       //opts->unmute_encrypted_p25 = 0;
     }
diff --git a/src/dsd_symbol.c b/src/dsd_symbol.c
index dd42556..10397d0 100644
--- a/src/dsd_symbol.c
+++ b/src/dsd_symbol.c
@@ -386,7 +386,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
               {
                 //sample = dmr_filter(sample); //work on filter later
               }
-              else if (opts->frame_nxdn96 == 0) //disable NXDN96 filter, allow internal RTL or SDR++ Low Pass Filter instead
+              else
               {
                 sample = dmr_filter(sample);
               }
diff --git a/src/nxdn_element.c b/src/nxdn_element.c
index 4d771b2..0d35164 100644
--- a/src/nxdn_element.c
+++ b/src/nxdn_element.c
@@ -1269,6 +1269,13 @@ void NXDN_decode_VCALL(dsd_opts * opts, dsd_state * state, uint8_t * Message)
     state->nxdn_key = KeyID;
     state->nxdn_cipher_type = CipherType;
   }
+  else
+  {
+    state->nxdn_last_rid = 0;
+    state->nxdn_last_tg = 0;
+    sprintf (state->str50a, "%s", "");
+    memset (state->nxdn_alias_block_segment, 0, sizeof(state->nxdn_alias_block_segment));
+  }
 
   //set enc bit here so we can tell playSynthesizedVoice whether or not to play enc traffic
   if (state->nxdn_cipher_type != 0)