summaryrefslogtreecommitdiffstats
path: root/src/runtime/Qt3DSComponentManager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/runtime/Qt3DSComponentManager.cpp')
-rw-r--r--src/runtime/Qt3DSComponentManager.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/runtime/Qt3DSComponentManager.cpp b/src/runtime/Qt3DSComponentManager.cpp
index 5eaf52a..73c3467 100644
--- a/src/runtime/Qt3DSComponentManager.cpp
+++ b/src/runtime/Qt3DSComponentManager.cpp
@@ -85,7 +85,8 @@ void CComponentManager::GotoSlideIndex(TElement *inComponent,
return;
}
- if (theComponent->GetActive() == false) {
+ if (!theComponent->GetActive() || theComponent->AboutToDeactivate()) {
+ // When (becoming) not active, don't proceed slide switching
m_ComponentInitialSlideMap[inComponent] = inGotoData;
return;
}