fixed subscription to waypoints

2 files changed, 5 insertions, 1 deletions

diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index dc4d3c0c0e..bcd50765f9 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -2377,7 +2377,9 @@ void ApplicationManagerImpl::UnregisterApplication(
   }
   if (1 == subscribed_for_way_points_app_count) {
     LOG4CXX_ERROR(logger_, "Send UnsubscribeWayPoints");
-    UnsubscribeAppFromWayPoints(app_id);
+    if (!is_unexpected_disconnect) {
+      UnsubscribeAppFromWayPoints(app_id);
+    }
     MessageHelper::SendUnsubscribedWayPoints(*this);
   }
 
diff --git a/src/components/application_manager/src/resumption/resumption_data_processor.cc b/src/components/application_manager/src/resumption/resumption_data_processor.cc
index f2901f5d60..54a846ed59 100644
--- a/src/components/application_manager/src/resumption/resumption_data_processor.cc
+++ b/src/components/application_manager/src/resumption/resumption_data_processor.cc
@@ -521,6 +521,8 @@ void ResumptionDataProcessor::AddWayPointsSubscription(
         application_manager_.GetNextHMICorrelationID());
     (*subscribe_waypoints_msg)[strings::params][strings::message_type] =
         hmi_apis::messageType::request;
+    (*subscribe_waypoints_msg)[strings::msg_params][strings::app_id] =
+        application->app_id();
     ProcessHMIRequest(subscribe_waypoints_msg, true);
   }
 }