summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Keeler <jacob.keeler@livioradio.com>2020-10-01 13:16:50 -0400
committerGitHub <noreply@github.com>2020-10-01 13:16:50 -0400
commitbb02b070482126fda4968e6d98cf610b1720b167 (patch)
tree79aef6d5f3778c9d923cab99e86f2d59c3ce754d
parent01c9705cf408e010bd9f98c5230347975da69c4a (diff)
parent7b03c2ec5e28a211bf7359e7700ca68ece3e8c21 (diff)
downloadsdl_core-bb02b070482126fda4968e6d98cf610b1720b167.tar.gz
Merge pull request #3523 from smartdevicelink/fix/play_tone_without_tts
Ignore playTone if provided without TTSChunks
-rw-r--r--src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc
index 5312491035..cfd3106f4d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc
@@ -111,10 +111,11 @@ void AlertRequest::Run() {
(*message_)[strings::msg_params][strings::tts_chunks].length();
}
- if ((tts_chunks_exists && length_tts_chunks) ||
- ((*message_)[strings::msg_params].keyExists(strings::play_tone) &&
- (*message_)[strings::msg_params][strings::play_tone].asBool())) {
+ if (tts_chunks_exists && length_tts_chunks) {
awaiting_tts_speak_response_ = true;
+ } else if ((*message_)[strings::msg_params].keyExists(strings::play_tone) &&
+ (*message_)[strings::msg_params][strings::play_tone].asBool()) {
+ set_warning_info("playTone ignored since TTS Chunks were not provided");
}
SendAlertRequest(app_id);