From 6e1f28917ede6b019f0b6cbac47a5a66ff7c8501 Mon Sep 17 00:00:00 2001
From: Denny <denny@denny-desktop>
Date: Sun, 31 Jul 2016 09:20:00 -0400
Subject: [PATCH] Resolves null pointer exception when updating identifier from
 values.

---
 src/module/decode/p25/P25DecoderState.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/module/decode/p25/P25DecoderState.java b/src/module/decode/p25/P25DecoderState.java
index ffb5c5f0..a2fe9313 100644
--- a/src/module/decode/p25/P25DecoderState.java
+++ b/src/module/decode/p25/P25DecoderState.java
@@ -3258,8 +3258,8 @@ public class P25DecoderState extends DecoderState
 				broadcast( new Metadata( MetadataType.FROM, mFromTalkgroup, mFromAlias, true ) );
 
 				if( mCurrentCallEvent != null &&
-					mCurrentCallEvent.getFromID() == null ||
-					!mCurrentCallEvent.getFromID().contentEquals( from ) )
+                    ( mCurrentCallEvent.getFromID() == null ||
+					  !mCurrentCallEvent.getFromID().contentEquals( from ) ) )
 				{
 					mCurrentCallEvent.setFromID( from );
 					broadcast( mCurrentCallEvent );