Prevent HMI commands processing while SDL is stopping (#3781)

smartdevicelink · Sep 28, 2021 · 86dd7b1 · 86dd7b1
1 parent de58a41
commit 86dd7b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/components/application_manager/src/commands/request_to_hmi.cc b/src/components/application_manager/src/commands/request_to_hmi.cc
@@ -137,6 +137,7 @@ bool RequestToHMI::Init() {
 }
 
 bool RequestToHMI::CleanUp() {
+  unsubscribe_from_all_hmi_events();
   return true;
 }
 

diff --git a/src/components/application_manager/src/rpc_service_impl.cc b/src/components/application_manager/src/rpc_service_impl.cc
@@ -392,7 +392,9 @@ bool RPCServiceImpl::ManageHMICommand(const commands::MessageSharedPtr message,
   if (kRequest == message_type) {
     SDL_LOG_DEBUG("ManageHMICommand");
     command->set_warning_info(warning_info);
-    request_ctrl_.AddHMIRequest(command);
+    if (!app_manager_.IsStopping()) {
+      request_ctrl_.AddHMIRequest(command);
+    }
   }
 
   if (command->Init()) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -137,6 +137,7 @@ bool RequestToHMI::Init() { @@
     }
     bool RequestToHMI::CleanUp() {
+      unsubscribe_from_all_hmi_events();
       return true;
     }
@@ Expand Down @@