1 files changed, 8 insertions, 7 deletions
diff --git a/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc b/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc
index 92e7cb7b2..9a146c19e 100644
--- a/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2013, Ford Motor Company
  * All rights reserved.
  *
@@ -49,7 +49,7 @@ OnVRLanguageChangeNotification::~OnVRLanguageChangeNotification() {
 }
 
 void OnVRLanguageChangeNotification::Run() {
-  LOG4CXX_INFO(logger_, "OnVRLanguageChangeNotification::Run");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   HMICapabilities& hmi_capabilities =
       ApplicationManagerImpl::instance()->hmi_capabilities();
@@ -65,16 +65,17 @@ void OnVRLanguageChangeNotification::Run() {
       static_cast<int32_t>(mobile_apis::FunctionID::OnLanguageChangeID);
 
   ApplicationManagerImpl::ApplicationListAccessor accessor;
-  const std::set<ApplicationSharedPtr> applications = accessor.applications();
 
-  std::set<ApplicationSharedPtr>::iterator it = applications.begin();
-  for (;applications.end() != it; ++it) {
-    ApplicationSharedPtr app = (*it);
+  ApplicationManagerImpl::ApplictionSetIt it = accessor.begin();
+  for (; accessor.end() != it;) {
+    ApplicationSharedPtr app = *it++;
     (*message_)[strings::params][strings::connection_key] = app->app_id();
     SendNotificationToMobile(message_);
     if (static_cast<int32_t>(app->language())
         != (*message_)[strings::msg_params][strings::language].asInt()) {
-      app->set_hmi_level(mobile_api::HMILevel::HMI_NONE);
+
+      ApplicationManagerImpl::instance()->SetState<false>(app->app_id(),
+                                          mobile_api::HMILevel::HMI_NONE);
 
       MessageHelper::SendOnAppInterfaceUnregisteredNotificationToMobile(
           app->app_id(),