diff options
author | Tony Leinonen <tony.leinonen@qt.io> | 2021-02-10 14:15:14 +0200 |
---|---|---|
committer | Tony Leinonen <tony.leinonen@qt.io> | 2021-02-18 12:42:55 +0200 |
commit | fdda73198193d2b297a020f6595e3610a4efc109 (patch) | |
tree | 849d6bcfc1c4b4da7b0f24160ec98ee68402e8bd | |
parent | ee33ee96b7adee9432789a10edd48f2956f814e2 (diff) |
Fix if structure
Last structure did not work exactly as intented.
Task-number: QT3DS-4214
Change-Id: I5b691b5385c81eff7b6134268918b3c7b84a29da
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
-rw-r--r-- | src/runtime/Qt3DSComponentManager.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/runtime/Qt3DSComponentManager.cpp b/src/runtime/Qt3DSComponentManager.cpp index 27d75e1..38eeeac 100644 --- a/src/runtime/Qt3DSComponentManager.cpp +++ b/src/runtime/Qt3DSComponentManager.cpp @@ -85,13 +85,11 @@ void CComponentManager::GotoSlideIndex(TElement *inComponent, return; } - if (theComponent->GetActive()) { - if (!theComponent->IsAnyParentAboutToActivate()) { - if (theComponent->AboutToDeactivate()) { - // 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; } } |