summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAGaliuzov <AGaliuzov@luxoft.com>2016-03-24 16:18:09 +0200
committerAGaliuzov <AGaliuzov@luxoft.com>2016-03-24 16:18:09 +0200
commita66d1bd4de4661e6f7b31a874895b54dd9b72011 (patch)
treea3e0aed65d44037f265ab3e33bfee976e1102967
parent98b34b9746e9c32b3453488d757632db2716f465 (diff)
parent3d716df6f82edfe1a2aa2017a934e205b5da3ede (diff)
downloadsdl_core-a66d1bd4de4661e6f7b31a874895b54dd9b72011.tar.gz
Merge pull request #429 from OHerasym/hotfix/Slider_sends_GENERIC_ERROR_instead_of_TIMED_OUT
Fix Slider send GENERIC_ERROR instead of TIMED_OUT
-rw-r--r--src/components/application_manager/src/commands/mobile/slider_request.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/application_manager/src/commands/mobile/slider_request.cc b/src/components/application_manager/src/commands/mobile/slider_request.cc
index 78a9bb6aac..cef2bed1fc 100644
--- a/src/components/application_manager/src/commands/mobile/slider_request.cc
+++ b/src/components/application_manager/src/commands/mobile/slider_request.cc
@@ -34,6 +34,7 @@
#include "application_manager/commands/mobile/slider_request.h"
#include "application_manager/application_manager_impl.h"
#include "application_manager/application_impl.h"
+#include "config_profile/profile.h"
namespace application_manager {
@@ -52,7 +53,7 @@ bool SliderRequest::Init() {
/* Timeout in milliseconds.
If omitted a standard value of 10000 milliseconds is used.*/
if ((*message_)[strings::msg_params].keyExists(strings::timeout)) {
- default_timeout_ =
+ default_timeout_ = profile::Profile::instance()->default_timeout() +
(*message_)[strings::msg_params][strings::timeout].asUInt();
}