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

Merge branch 'master' into #90-channel_processing_list_and_gui_reformat

Browse Source 
# Conflicts:
#	src/alias/AliasList.java
This commit is contained in:
Denny
2017-01-18 19:07:39 -05:00
parent bc8873de01 929fbdb21e
commit acabab35ff
3 changed files with 100 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/module/decode/p25/P25DecoderState.java
View File

@@ -2917,8 +2917,8 @@ public class P25DecoderState extends DecoderState
{
PatchGroupAlias patchGroupAlias = null;
//Check for an existing alias for the patch talkgroup
Alias existingAlias = getAliasList().getTalkgroupAlias(patchGroupID);
//Check for an existing alias for the patch talkgroup - do not include wildcard aliases
Alias existingAlias = getAliasList().getTalkgroupAlias(patchGroupID, false);
if(existingAlias instanceof PatchGroupAlias)
{
@@ -2928,6 +2928,8 @@ public class P25DecoderState extends DecoderState
{
patchGroupAlias = new PatchGroupAlias();
patchGroupAlias.addAliasID(new TalkgroupID(patchGroupID));
if(existingAlias != null)
{
getAliasList().removeAlias(existingAlias);
@@ -2935,8 +2937,6 @@ public class P25DecoderState extends DecoderState
patchGroupAlias.setPatchGroupAlias(existingAlias);
}
patchGroupAlias.addAliasID(new TalkgroupID(patchGroupID));
getAliasList().addAlias(patchGroupAlias);
}