diff options
| -rw-r--r-- | src/runtime/Qt3DSActivationManager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/runtime/Qt3DSActivationManager.cpp b/src/runtime/Qt3DSActivationManager.cpp index 0e7ad6c..f03eff1 100644 --- a/src/runtime/Qt3DSActivationManager.cpp +++ b/src/runtime/Qt3DSActivationManager.cpp @@ -689,14 +689,16 @@ struct STimeContext Mutex::ScopedLock __locker(m_ElementAccessMutex); // 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)) { inComponentManager.GotoSlideIndex(&theContextNode, 1, false); - inComponentManager.applyQueuedChanges(&theContextNode); } + inComponentManager.applyQueuedChanges(&theContextNode); } else RemoveOverride(); } + if (isActive) { QT3DS_PERF_SCOPED_TIMER(inPerfTimer, "ActivationManager: Update Local Time") bool atEndOfTime = CalculateNewTime(inGlobalTime); |