Merge branch 'main' of github.com:ignitionrobotics/ign-gazebo into jr…

…ivero/win/fix_visibility_names
gazebosim · Jan 19, 2021 · 198d90a · 198d90a
2 parents a33592d + d5f96fb
commit 198d90a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/EntityComponentManager.cc b/src/EntityComponentManager.cc
@@ -1215,7 +1215,9 @@ void EntityComponentManager::SetState(
         std::istringstream istr(compMsg.component());
         comp->Deserialize(istr);
         this->SetChanged(entity, compIter.first,
-            ComponentState::OneTimeChange);
+            _stateMsg.has_one_time_component_changes() ?
+            ComponentState::OneTimeChange :
+            ComponentState::PeriodicChange);
       }
     }
   }

diff --git a/src/network/NetworkManagerSecondary.cc b/src/network/NetworkManagerSecondary.cc
@@ -167,6 +167,8 @@ void NetworkManagerSecondary::OnStep(
   msgs::SerializedStateMap stateMsg;
   if (!entities.empty())
     this->dataPtr->ecm->State(stateMsg, entities);
+  stateMsg.set_has_one_time_component_changes(
+    this->dataPtr->ecm->HasOneTimeComponentChanges());
 
   this->stepAckPub.Publish(stateMsg);