fix #17637

Author: namdre

src/guisim/GUIVehicle.cpp

@@ -95,6 +95,7 @@ GUIVehicle::GUIVehicle(SUMOVehicleParameter* pars, ConstMSRoutePtr route,
 
 GUIVehicle::~GUIVehicle() {
     gSelected.deselect(GLO_VEHICLE, getGlID());
+    cleanupOnDestruction();
 }
 
 

src/mesogui/GUIMEVehicle.cpp

@@ -55,7 +55,10 @@ GUIMEVehicle::GUIMEVehicle(SUMOVehicleParameter* pars, ConstMSRoutePtr route,
 #endif
 
 
-GUIMEVehicle::~GUIMEVehicle() { }
+GUIMEVehicle::~GUIMEVehicle() {
+    gSelected.deselect(GLO_VEHICLE, getGlID());
+    cleanupOnDestruction();
+}
 
 
 GUIParameterTableWindow*

src/utils/gui/globjects/GUIGlObject.cpp

@@ -191,13 +191,19 @@ GUIGlObject::GUIGlObject(GUIGlObjectType type, const std::string& microsimID, FX
 
 
 GUIGlObject::~GUIGlObject() {
+    cleanupOnDestruction();
+    GUIGlObjectStorage::gIDStorage.remove(getGlID());
+}
+
+
+void
+GUIGlObject::cleanupOnDestruction() {
     // remove all paramWindow related with this object
     for (const auto& paramWindow : myParamWindows) {
         paramWindow->removeObject(this);
     }
     // remove object from GLObjectValuePassConnector and GUIGlObjectStorage
     GLObjectValuePassConnector<double>::removeObject(*this);
-    GUIGlObjectStorage::gIDStorage.remove(getGlID());
 }
 
 

src/utils/gui/globjects/GUIGlObject.h

@@ -313,6 +313,9 @@ class GUIGlObject {
     /// @brief build basic additional popup options. Used to unify pop-ups menu in netedit and SUMO-GUI
     void buildAdditionalsPopupOptions(GUIMainWindow& app, GUIGLObjectPopupMenu* ret, const std::string& type);
 
+    /// @brief to be called by child class to ensure cleanup in correct order
+    void cleanupOnDestruction();
+
 private:
     /// @brief The numerical id of the object
     const GUIGlID myGlID;