1 files changed, 6 insertions, 5 deletions
diff --git a/src/runtime/Qt3DSComponentManager.cpp b/src/runtime/Qt3DSComponentManager.cpp
index 68e6ecd..f20176b 100644
--- a/src/runtime/Qt3DSComponentManager.cpp
+++ b/src/runtime/Qt3DSComponentManager.cpp
@@ -85,11 +85,12 @@ void CComponentManager::GotoSlideIndex(TElement *inComponent,
         return;
     }
 
-    if (!theComponent->GetActive() || !theComponent->IsExplicitActive()
-        || !theComponent->areAllParentsActive()) {
-        // When (becoming) not active, don't proceed slide switching
-        m_ComponentInitialSlideMap[inComponent] = inGotoData;
-        return;
+    if (!theComponent->IsAnyParentAboutToActivate()) {
+        if (!theComponent->GetActive() || theComponent->AboutToDeactivate()) {
+            // When (becoming) not active, don't proceed slide switching
+            m_ComponentInitialSlideMap[inComponent] = inGotoData;
+            return;
+        }
     }
 
     SComponentGotoSlideData theGotoSlideData(inGotoData);