From 1aa22789e5030c956405b11ffe0e06b58a3f5439 Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Sun, 3 May 2020 09:25:23 +0000 Subject: [PATCH] #783 Resolves issue with P25 Phase 2 channel grants (#784) Co-authored-by: Denny --- .../module/decode/p25/phase2/P25P2DecoderHDQPSK.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/phase2/P25P2DecoderHDQPSK.java b/src/main/java/io/github/dsheirer/module/decode/p25/phase2/P25P2DecoderHDQPSK.java index 66db22b8..0949ca48 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/phase2/P25P2DecoderHDQPSK.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/phase2/P25P2DecoderHDQPSK.java @@ -95,7 +95,11 @@ public class P25P2DecoderHDQPSK extends P25P2Decoder implements IdentifierUpdate //The Costas Loop receives symbol-inversion correction requests when detected. //The PLL gain monitor receives sync detect/loss signals from the message framer mMessageFramer = new P25P2MessageFramer(mCostasLoop, DecoderType.P25_PHASE2.getProtocol().getBitRate()); - mMessageFramer.setScrambleParameters(mDecodeConfigP25Phase2.getScrambleParameters()); + + if(mDecodeConfigP25Phase2 !=null) + { + mMessageFramer.setScrambleParameters(mDecodeConfigP25Phase2.getScrambleParameters()); + } mFrequencyCorrectionSyncMonitor = new FrequencyCorrectionSyncMonitor(mCostasLoop, this); mMessageFramer.setSyncDetectListener(mFrequencyCorrectionSyncMonitor);