summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrunov Dmitrii <dtrunov@luxoft.com>2014-06-24 17:52:39 +0300
committerTrunov Dmitrii <dtrunov@luxoft.com>2014-06-24 17:53:29 +0300
commit7e57fd92ab95e8b9e00c15624ee4fbc5fdec091a (patch)
treeba0ceb05f56753845400f213efbace4db6f27278
parentf571b65fdd19b9d26cc969c6d38e703e13ac4b44 (diff)
downloadsdl_core-7e57fd92ab95e8b9e00c15624ee4fbc5fdec091a.tar.gz
APPLINK-2539:API.Show SoftButtons from previous Show request remains on HMI after sending second Show request without SoftButtons
-rw-r--r--src/components/application_manager/src/commands/mobile/show_request.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/components/application_manager/src/commands/mobile/show_request.cc b/src/components/application_manager/src/commands/mobile/show_request.cc
index 07db011277..921c78b35f 100644
--- a/src/components/application_manager/src/commands/mobile/show_request.cc
+++ b/src/components/application_manager/src/commands/mobile/show_request.cc
@@ -73,8 +73,12 @@ void ShowRequest::Run() {
return;
}
- mobile_apis::Result::eType processing_result =
- MessageHelper::ProcessSoftButtons((*message_)[strings::msg_params], app);
+ mobile_apis::Result::eType processing_result = mobile_apis::Result::SUCCESS;
+ if(((*message_)[strings::msg_params].keyExists(strings::soft_buttons)) &&
+ ((*message_)[strings::msg_params][strings::soft_buttons].length() > 0)) {
+ processing_result =
+ MessageHelper::ProcessSoftButtons((*message_)[strings::msg_params], app);
+ }
if (mobile_apis::Result::SUCCESS != processing_result) {
LOG4CXX_ERROR(logger_, "INVALID_DATA!");