From fd1cd49d2a94f3258433889e86dcc46b817c18c2 Mon Sep 17 00:00:00 2001 From: JackLivio Date: Fri, 18 Oct 2019 13:20:27 -0400 Subject: Set alert duration to 0 if softbuttons exist (#3089) --- .../rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 8e90de8b51..57912e7087 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 @@ -352,6 +352,10 @@ void AlertRequest::SendAlertRequest(int32_t app_id) { (*message_)[strings::msg_params][strings::soft_buttons]; MessageHelper::SubscribeApplicationToSoftButton( (*message_)[strings::msg_params], app, function_id()); + msg_params[strings::duration] = 0; + } else { + msg_params[strings::duration] = + (*message_)[strings::msg_params][strings::duration].asUInt(); } if ((*message_)[strings::msg_params].keyExists(strings::alert_icon)) { @@ -372,8 +376,6 @@ void AlertRequest::SendAlertRequest(int32_t app_id) { // app_id msg_params[strings::app_id] = app_id; - msg_params[strings::duration] = - (*message_)[strings::msg_params][strings::duration].asUInt(); // NAVI platform progressIndicator if ((*message_)[strings::msg_params].keyExists(strings::progress_indicator)) { -- cgit v1.2.1