diff options
| -rw-r--r-- | src/runtime/Qt3DSActivationManager.cpp | 3 | ||||
| -rw-r--r-- | src/runtime/Qt3DSComponentManager.cpp | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/runtime/Qt3DSActivationManager.cpp b/src/runtime/Qt3DSActivationManager.cpp index f03eff1..9aa16f5 100644 --- a/src/runtime/Qt3DSActivationManager.cpp +++ b/src/runtime/Qt3DSActivationManager.cpp @@ -690,8 +690,7 @@ struct STimeContext // When the component is activated the first time go to the first slide // Subsequent activations should continue from the deactivated slide - if (theContextNode.GetCurrentSlide() == 0 - || inComponentManager.hasSlideChangeQueued(&theContextNode)) { + if (theContextNode.GetCurrentSlide() == 0) { inComponentManager.GotoSlideIndex(&theContextNode, 1, false); } inComponentManager.applyQueuedChanges(&theContextNode); diff --git a/src/runtime/Qt3DSComponentManager.cpp b/src/runtime/Qt3DSComponentManager.cpp index 03c7b2c..9bbff99 100644 --- a/src/runtime/Qt3DSComponentManager.cpp +++ b/src/runtime/Qt3DSComponentManager.cpp @@ -94,13 +94,6 @@ void CComponentManager::GotoSlideIndex(TElement *inComponent, } SComponentGotoSlideData theGotoSlideData(inGotoData); - - TComponentGotoSlideDataMap::iterator iter = m_ComponentInitialSlideMap.find(inComponent); - if (iter != m_ComponentInitialSlideMap.end()) { - theGotoSlideData = iter->second; - m_ComponentInitialSlideMap.erase(iter); - } - const UINT8 theCurrentSlideIndex = theComponent->GetCurrentSlide(); QString elementPath; |