Merged in julian_lilov/librepilot-jdl/LP-605_PathPlan_Resume_Fix (pull request #522)

LP-605 PathPlan 'Resume' Fix

Approved-by: Lalanne Laurent <f5soh@free.fr>

Author: jdlilov

flight/modules/PathPlanner/pathplanner.c

@@ -222,16 +222,19 @@ static void pathPlannerTask()
     }
 
     // the transition from pathplanner to another flightmode back to pathplanner
-    // triggers a reset back to 0 index in the waypoint list
+    // triggers a reset back either to 0 index in the waypoint list,
+    // or to current index in the waypoint list, depending on FlightModeChangeRestartsPathPlan setting
     if (pathplanner_active == false) {
         pathplanner_active = true;
 
         FlightModeSettingsFlightModeChangeRestartsPathPlanOptions restart;
         FlightModeSettingsFlightModeChangeRestartsPathPlanGet(&restart);
         if (restart == FLIGHTMODESETTINGS_FLIGHTMODECHANGERESTARTSPATHPLAN_TRUE) {
             setWaypoint(0);
-            return;
+        } else {
+            setWaypoint(waypointActive.Index);
         }
+        return;
     }
 
     WaypointInstGet(waypointActive.Index, &waypoint);