summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndriy Byzhynar (GitHub) <AByzhynar@luxoft.com>2016-12-23 17:22:41 +0200
committerGitHub <noreply@github.com>2016-12-23 17:22:41 +0200
commitf217594237cce3e8bfe9b17a0d61bbc28dfb7fa9 (patch)
treee16abf23e0d556a5103cd85446cd8d16d329ff6a
parent72ca0b457018646f3808b80e20fabdf884ac1939 (diff)
parentb52b77537616e0c20bb889c9334b8da8387a64f8 (diff)
downloadsdl_core-f217594237cce3e8bfe9b17a0d61bbc28dfb7fa9.tar.gz
Merge pull request #1115 from indlu/fix/Fix_SDL_retry_send_StartStream_less_than_ini_file
Fixing incorrect counting retry StartStream
-rw-r--r--src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc2
-rw-r--r--src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc
index 1e46eab52e..0bcb26df8a 100644
--- a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc
@@ -156,7 +156,7 @@ void AudioStartStreamRequest::RetryStartSession() {
}
uint32_t curr_retry_number = app->audio_stream_retry_number();
- if (curr_retry_number < retry_number_ - 1) {
+ if (curr_retry_number < retry_number_) {
LOG4CXX_DEBUG(
logger_,
"Send AudioStartStream retry. retry_number = " << curr_retry_number);
diff --git a/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc
index 9f1c4b7902..b06c69e703 100644
--- a/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc
+++ b/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc
@@ -113,7 +113,7 @@ void NaviStartStreamRequest::on_event(const event_engine::Event& event) {
}
if (hmi_apis::Common_Result::REJECTED == code) {
LOG4CXX_INFO(logger_, "StartStream response REJECTED ");
- SendRequest();
+ RetryStartSession();
break;
}
}
@@ -156,7 +156,7 @@ void NaviStartStreamRequest::RetryStartSession() {
}
uint32_t curr_retry_number = app->video_stream_retry_number();
- if (curr_retry_number < retry_number_ - 1) {
+ if (curr_retry_number < retry_number_) {
LOG4CXX_DEBUG(
logger_,
"Send NaviStartStream retry. retry_number = " << curr_retry_number);