Merges master 1550c62 - channel state panel null checking

This commit is contained in:
denny
2016-02-27 09:04:13 -05:00
parent 15716d1270
commit ece555dead

View File

@@ -227,7 +227,8 @@ public class ChannelPanel extends JPanel
switch( changedAttribute ) switch( changedAttribute )
{ {
case CHANNEL_STATE: case CHANNEL_STATE:
if( mChannelState.getState() != null ) if( mChannelState != null &&
mChannelState.getState() != null )
{ {
mStateLabel.setText( mChannelState.getState().getDisplayValue() ); mStateLabel.setText( mChannelState.getState().getDisplayValue() );
} }