GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 09:37:36 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#2020 P25 channel null frequency band error. (#2021)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2024-10-16 02:59:55 -04:00
committed by GitHub
parent 024a624083
commit 54a0ca5247
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/APCO25Channel.java
View File

@@ -135,7 +135,12 @@ public class APCO25Channel extends Identifier<P25Channel> implements IChannelDes
} }
P25Channel decoratedChannel = new P25Channel(existing.getBandIdentifier(), channelNumber); P25Channel decoratedChannel = new P25Channel(existing.getBandIdentifier(), channelNumber);
decoratedChannel.setFrequencyBand(existing.getFrequencyBand());
if(existing.getFrequencyBand() != null)
{
decoratedChannel.setFrequencyBand(existing.getFrequencyBand());
}
return new APCO25Channel(decoratedChannel); return new APCO25Channel(decoratedChannel);
} }

2
src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/P25Channel.java
View File

@@ -134,7 +134,7 @@ public class P25Channel implements IChannelDescriptor
@Override @Override
public void setFrequencyBand(IFrequencyBand frequencyBand) public void setFrequencyBand(IFrequencyBand frequencyBand)
{ {
if(frequencyBand.getIdentifier() == getDownlinkBandIdentifier()) if(frequencyBand != null && frequencyBand.getIdentifier() == getDownlinkBandIdentifier())
{ {
mFrequencyBand = frequencyBand; mFrequencyBand = frequencyBand;
} }