diff options
| author | Collin <iCollin@users.noreply.github.com> | 2021-05-06 13:10:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-06 13:10:07 -0400 |
| commit | d9fd9fb66ecd854207d8bbd5efb1728f1f6c1b5b (patch) | |
| tree | 7e5dba80e1ab45da99703b286a47ea394eb534a4 | |
| parent | c15ef6c045540bbfcb43dba8533b70c21616c740 (diff) | |
| download | sdl_core-d9fd9fb66ecd854207d8bbd5efb1728f1f6c1b5b.tar.gz | |
reorder shutdown calls to prevent deadlock (#3691)
| -rw-r--r-- | src/appMain/life_cycle_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/appMain/life_cycle_impl.cc b/src/appMain/life_cycle_impl.cc index a14ca1240c..8b67877ac8 100644 --- a/src/appMain/life_cycle_impl.cc +++ b/src/appMain/life_cycle_impl.cc @@ -264,15 +264,15 @@ void LifeCycleImpl::StopComponents() { DCHECK_OR_RETURN_VOID(hmi_handler_); hmi_handler_->set_message_observer(NULL); - DCHECK_OR_RETURN_VOID(connection_handler_); - connection_handler_->set_connection_handler_observer(NULL); - DCHECK_OR_RETURN_VOID(protocol_handler_); protocol_handler_->RemoveProtocolObserver(&(app_manager_->GetRPCHandler())); DCHECK_OR_RETURN_VOID(app_manager_); app_manager_->Stop(); + DCHECK_OR_RETURN_VOID(connection_handler_); + connection_handler_->set_connection_handler_observer(NULL); + SDL_LOG_INFO("Stopping Protocol Handler"); DCHECK_OR_RETURN_VOID(protocol_handler_); protocol_handler_->RemoveProtocolObserver(media_manager_); |