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

Resolved issue with duplicate Do Not Monitor events being sent to the

Browse Source 
call event panel.
This commit is contained in:
denny
2015-09-12 11:42:26 -04:00
parent 82ce3c668a
commit 895067f71e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/module/decode/state/TrafficChannelManager.java
View File

@@ -10,7 +10,6 @@ import module.decode.config.DecodeConfiguration;
import module.decode.event.CallEvent; import module.decode.event.CallEvent;
import module.decode.event.CallEvent.CallEventType; import module.decode.event.CallEvent.CallEventType;
import module.decode.event.ICallEventProvider; import module.decode.event.ICallEventProvider;
import module.decode.mpt1327.MPT1327CallEvent;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -175,6 +174,8 @@ public class TrafficChannelManager extends Module
/* Check the from/to aliases for do not monitor priority */ /* Check the from/to aliases for do not monitor priority */
if( isDoNotMonitor( callEvent ) ) if( isDoNotMonitor( callEvent ) )
{ {
callEvent.setCallEventType( CallEventType.CALL_DO_NOT_MONITOR );
if( isSameCallEvent( mPreviousDoNotMonitorCallEvent, callEvent ) ) if( isSameCallEvent( mPreviousDoNotMonitorCallEvent, callEvent ) )
{ {
return; return;
@@ -182,7 +183,6 @@ public class TrafficChannelManager extends Module
else else
{ {
mPreviousDoNotMonitorCallEvent = callEvent; mPreviousDoNotMonitorCallEvent = callEvent;
callEvent.setCallEventType( CallEventType.CALL_DO_NOT_MONITOR );
} }
} }
else if( frequency > 0 ) else if( frequency > 0 )
@@ -236,9 +236,12 @@ public class TrafficChannelManager extends Module
*/ */
public static boolean isSameCallEvent( CallEvent e1, CallEvent e2 ) public static boolean isSameCallEvent( CallEvent e1, CallEvent e2 )
{ {
if( e1 == null || if( e1 == null || e2 == null )
e2 == null || {
e1.getCallEventType() != e2.getCallEventType() ) return false;
}
if( e1.getCallEventType() != e2.getCallEventType() )
{ {
return false; return false;
} }