FIX: Properly update AI aircrafts when deleting user aircraft during

replay

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Export
   * Illegal file path characters are replaced by _ in the initially suggested file path
   * KML export: exported character data (title, description) is properly enclosed in a CDATA tag
+- Properly update AI aircrafts when deleting the user aircraft during replay
 
 ## 0.8.3
 

src/Persistence/src/Service/AircraftService.cpp

@@ -84,20 +84,18 @@ bool AircraftService::deleteByIndex(int index) noexcept
     // Remove AI object
     Flight &flight = Logbook::getInstance().getCurrentFlight();
 
+    const bool removeUserAircraft = flight.getUserAircraftIndex() == index;
     Aircraft &aircraft = flight[index];
     std::optional<std::reference_wrapper<SkyConnectIntf>> skyConnect = SkyConnectManager::getInstance().getCurrentSkyConnect();
     if (skyConnect) {
         skyConnect->get().destroyAIObject(aircraft);
     }
     const qint64 aircraftId = flight.deleteAircraftByIndex(index);
-    if (skyConnect) {
-        const bool userAircraftRemoved = flight.getUserAircraftIndex() == index;
-        if (userAircraftRemoved) {
-            skyConnect->get().updateUserAircraft();
-        }
-    }
     bool ok;
     if (aircraftId != Aircraft::InvalidId) {
+        if (skyConnect && removeUserAircraft) {
+            skyConnect->get().updateUserAircraft();
+        }
         ok = QSqlDatabase::database().transaction();
         if (ok) {
             ok = d->aircraftDao->deleteById(aircraftId);