From 73532c37b04940ebd767ced0bc840bc70aa4f21b Mon Sep 17 00:00:00 2001
From: Filippo Gentile <gentilefilippo01@gmail.com>
Date: Thu, 15 Jun 2023 12:34:29 +0200
Subject: [PATCH] TrainVehicleListItem: fix deleting item

---
 server/src/train/trainvehiclelistitem.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/train/trainvehiclelistitem.cpp b/server/src/train/trainvehiclelistitem.cpp
index 6c80a5b7b..b2f8b6a14 100644
--- a/server/src/train/trainvehiclelistitem.cpp
+++ b/server/src/train/trainvehiclelistitem.cpp
@@ -70,9 +70,11 @@ std::string TrainVehicleListItem::getObjectId() const
 
 void TrainVehicleListItem::destroying()
 {
+  //NOTE: we cannot normally set vehicle to nullptr (rejected by OnSet callback)
+  //So we mirror cleanup operations and manually reset value at end
   if(vehicle)
     disconnectVehicle(*vehicle.value());
-  vehicle = nullptr;
+  vehicle.setValueInternal(nullptr);
 
   Object::destroying();
 }