Apply suggestions from code reviewfix/erase_hmi_begin_state

Co-authored-by: Jacob Keeler <jacob.keeler@livioradio.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/components/application_manager/src/application_state.cc b/src/components/application_manager/src/application_state.cc
index f565ce2306..ee43d32b0a 100644
--- a/src/components/application_manager/src/application_state.cc
+++ b/src/components/application_manager/src/application_state.cc
@@ -204,11 +204,12 @@ void ApplicationState::RemoveHMIState(const WindowID window_id,
 
 void ApplicationState::EraseHMIState(HmiStates& hmi_states,
                                      HmiStates::iterator it) {
-  if (hmi_states.begin() == it && hmi_states.size() > 1) {
+  if (hmi_states.begin() == it) {
     HmiStates::iterator next = it;
     ++next;
-    if (*next && (*next)->parent() == *it) {
-      (*next)->set_parent(nullptr);
+    if (hmi_states.end() != next) {
+      HmiStatePtr next_state = *next;
+      next_state->set_parent(nullptr);
     }
   } else {
     HmiStates::iterator next = it;