Skip to content

Commit 0c0237b

Browse files
Check NPE in setVoiceCommands()
1 parent fe702eb commit 0c0237b

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,10 @@ public void setVoiceCommands(List<VoiceCommand> voiceCommands){
126126
waitingOnHMIUpdate = false;
127127
lastVoiceCommandId = voiceCommandIdMin;
128128
updateIdsOnVoiceCommands(voiceCommands);
129-
this.oldVoiceCommands = new ArrayList<>(this.voiceCommands);
129+
this.oldVoiceCommands = new ArrayList<>();
130+
if (this.voiceCommands != null && !this.voiceCommands.isEmpty()) {
131+
this.oldVoiceCommands.addAll(this.voiceCommands);
132+
}
130133
this.voiceCommands = new ArrayList<>(voiceCommands);
131134

132135
update();

0 commit comments

Comments
 (0)