Adapted to changes for Aerosoft CRJ export.

#632
albar965 · Apr 19, 2021 · 6b8c5df · 6b8c5df
1 parent e784309
commit 6b8c5df
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/route/routeflags.h b/src/route/routeflags.h
@@ -44,6 +44,9 @@ enum RouteAdjustOption
   /* Export adjust options for most export formats */
   DEFAULT_OPTS = rf::REPLACE_CUSTOM_WP | rf::REMOVE_ALTERNATE | rf::REMOVE_TRACKS | FIX_PROC_ENTRY_EXIT,
 
+  /* Do not add waypoint and procedure entry or exit back. */
+  DEFAULT_OPTS_PROC = rf::REPLACE_CUSTOM_WP | rf::REMOVE_ALTERNATE | rf::REMOVE_TRACKS,
+
   /* Always add entry and exit waypoints for procedures. This is used for formats not supporting procedures. */
   DEFAULT_OPTS_NO_PROC = rf::REPLACE_CUSTOM_WP | rf::REMOVE_ALTERNATE | rf::REMOVE_TRACKS | FIX_PROC_ENTRY_EXIT_ALWAYS,
 

diff --git a/src/routeexport/routeexport.cpp b/src/routeexport/routeexport.cpp
@@ -395,17 +395,24 @@ bool RouteExport::routeExportInternalFlp(const RouteExportFormat& format, bool c
   if(routeValidateMulti(format))
   {
     // Use shorter suffix for MSFS CFJ since it accepts only 8 characters
-    QString suffix = msfs ? ".flp" : "01.flp";
+    QString suffix = msfs || crj ? ".flp" : "01.flp";
 
     // <Documents>/Aerosoft/Airbus/Flightplans.
     QString routeFile = exportFileMulti(format, buildDefaultFilenameShort(QString(), suffix));
     if(!routeFile.isEmpty())
     {
       using namespace std::placeholders;
-      if(exportFlighplan(routeFile, rf::DEFAULT_OPTS,
-                         crj ?
-                         std::bind(&FlightplanIO::saveCrjFlp, flightplanIO, _1, _2) :
-                         std::bind(&FlightplanIO::saveFlp, flightplanIO, _1, _2)))
+      auto exportFunc = &FlightplanIO::saveFlp;
+      if(crj)
+      {
+        // Adapt to the format changes between the different aircraft (not sure if these are real)
+        if(msfs)
+          exportFunc = &FlightplanIO::saveMsfsCrjFlp;
+        else
+          exportFunc = &FlightplanIO::saveCrjFlp;
+      }
+
+      if(exportFlighplan(routeFile, rf::DEFAULT_OPTS, std::bind(exportFunc, flightplanIO, _1, _2)))
       {
         formatExportedCallback(format, routeFile);
         return true;