Merge branch 'develop' of cst.version.fz-juelich.de:jupedsim/jpscore into develop

Simulation.cpp

@@ -501,7 +501,10 @@ int Simulation::RunBody(double maxSimTime)
      _nPeds = _building->GetAllPedestrians().size();
      int initialnPeds = _nPeds;
      // main program loop
-     while ( (_nPeds || !_agentSrcManager.IsCompleted() ) && t < maxSimTime)
+
+     while ( (_nPeds > 0 || (!_agentSrcManager.IsCompleted() && (_hybridSimManager != nullptr))) && t < maxSimTime)
+     //while ( _nPeds && t < maxSimTime)
+
      {
           t = 0 + (frameNr - 1) * _deltaT;