From 27ca85fb2de83a25dcbc0ebcc41e3394f6563605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Mi=C5=A1i=C4=87?= <igy1000mb@gmail.com>
Date: Fri, 20 Aug 2021 13:40:42 +0200
Subject: [PATCH] mission: reset current sequence to the first item for
 finished old mission

---
 src/modules/navigator/mission.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/modules/navigator/mission.cpp b/src/modules/navigator/mission.cpp
index c6844c3bff6b..ba49534c903b 100644
--- a/src/modules/navigator/mission.cpp
+++ b/src/modules/navigator/mission.cpp
@@ -588,7 +588,14 @@ Mission::restore_old_mission()
 	if (valid) {
 		_mission_changed = true;
 		_navigator->get_mission_result()->failure = false;
-		_current_mission_index = _old_mission.current_seq;
+
+		/* For completed old mission reset sequence to the first item. */
+		if (_old_mission.current_seq >= _old_mission.count) {
+			_current_mission_index = 0;
+
+		} else {
+			_current_mission_index = _old_mission.current_seq;
+		}
 
 		/* lock MISSION_STATE item */
 		int dm_lock_ret = dm_lock(DM_KEY_MISSION_STATE);