Fix stateselection destructor

- Fixed a double free for FMUs with state selection
- Fixed a use of a pointer after it was free'd

Belonging to [master]:
  - #2391

SimulationRuntime/c/simulation/solver/model_help.c

@@ -1189,11 +1189,6 @@ void deInitializeDataStruc(DATA *data)
   free(data->simulationInfo->booleanParameter);
   omc_alloc_interface.free_uncollectable(data->simulationInfo->stringParameter);
 
-  if (data->modelData->nStateSets) {
-    /* free buffer for state sets */
-    omc_alloc_interface.free_uncollectable(data->simulationInfo->stateSetData);
-  }
-
   if (data->modelData->nMixedSystems) {
     /* free buffer of mixed systems */
     omc_alloc_interface.free_uncollectable(data->simulationInfo->mixedSystemData);
@@ -1237,6 +1232,10 @@ void deInitializeDataStruc(DATA *data)
   /* free stateset data */
   freeStateSetData(data);
 #endif
+  if (data->modelData->nStateSets) {
+    /* free buffer for state sets */
+    omc_alloc_interface.free_uncollectable(data->simulationInfo->stateSetData);
+  }
 
   /* free parameter sensitivities */
   if (omc_flag[FLAG_IDAS])

SimulationRuntime/fmi/export/fmi1/fmu1_model_interface.c

@@ -858,10 +858,6 @@ fmiStatus fmiTerminate(fmiComponent c)
   /* free linear system data */
   freeLinearSystems(comp->fmuData, comp->threadData);
 #endif
-#if !defined(OMC_NO_STATESELECTION)
-  /* free stateset data */
-  freeStateSetData(comp->fmuData);
-#endif
 
   /* free stateset data */
   deInitializeDataStruc(comp->fmuData);

SimulationRuntime/fmi/export/fmi2/fmu2_model_interface.c

@@ -643,10 +643,6 @@ fmi2Status fmi2Terminate(fmi2Component c)
 #if !defined(OMC_NUM_LINEAR_SYSTEMS) || OMC_NUM_LINEAR_SYSTEMS>0
   /* free linear system data */
   freeLinearSystems(comp->fmuData, comp->threadData);
-#endif
-#if !defined(OMC_NO_STATESELECTION)
-  /* free stateset data */
-  freeStateSetData(comp->fmuData);
 #endif
   /* free data struct */
   deInitializeDataStruc(comp->fmuData);