summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Nosach <ANosach@luxoft.com>2016-01-28 14:01:50 +0200
committerArtem Nosach <ANosach@luxoft.com>2016-01-28 14:01:50 +0200
commit370a5d117249caa9954e36ab96b23938a9d075e8 (patch)
tree7da0c4c0111c1aa4f3e95368617febebb0a1bb75
parent58dafada90a5fc8bc9de50069d0b99d61fca511b (diff)
parent0db67741babcd8c6f34f38d5194c04760dc9d47a (diff)
downloadsdl_core-370a5d117249caa9954e36ab96b23938a9d075e8.tar.gz
Merge pull request #361 from LuxoftSDL/hotfix/CreateInteractionChoiceSet_doesnt_send_VR_DeleteCommand
Hotfix/create interaction choice set doesnt send vr delete command
-rw-r--r--src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc b/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc
index 813f550919..58c6d7e192 100644
--- a/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc
+++ b/src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc
@@ -408,13 +408,14 @@ void CreateInteractionChoiceSetRequest::onTimeOut() {
if (!error_from_hmi_) {
SendResponse(false, mobile_apis::Result::GENERIC_ERROR);
}
+ DeleteChoices();
// We have to keep request alive until receive all responses from HMI
// according to SDLAQ-CRS-2976
sync_primitives::AutoLock timeout_lock_(is_timed_out_lock_);
is_timed_out_ = true;
- ApplicationManagerImpl::instance()->updateRequestTimeout(
- connection_key(), correlation_id(), 0);
+ ApplicationManagerImpl::instance()->TerminateRequest(
+ connection_key(), correlation_id());
}
void CreateInteractionChoiceSetRequest::DeleteChoices() {