summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@qt.io>2018-06-06 11:53:12 +0200
committerChristian Stromme <christian.stromme@qt.io>2018-06-06 10:38:48 +0000
commit4a29723e1551fd59f46457a3baca7abd003f6e6a (patch)
tree9112fbe5c0eeaa3f32939dbe0e14c4c0893a4fa3
parent81e0fc743cd69928f3647f44d2535e5753707d4b (diff)
Delete slide animator
This is a partial revert of b9b13f7c0a6, as just removing the animator from the entity doesn't seem to be sufficient. Change-Id: I56f9e572bf77d53e1f5befea256973e251bbc1ef Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
-rw-r--r--src/runtime/q3dsslideplayer.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/runtime/q3dsslideplayer.cpp b/src/runtime/q3dsslideplayer.cpp
index 9e4b142..a154292 100644
--- a/src/runtime/q3dsslideplayer.cpp
+++ b/src/runtime/q3dsslideplayer.cpp
@@ -130,6 +130,9 @@ static void detatchPositionCallback(Q3DSSlide *slide)
if (animator) {
Q_ASSERT(!animator->isRunning());
slide->attached()->entity->removeComponent(animator);
+ // TODO: Figure out why this is needed.
+ data->animator = nullptr;
+ delete animator;
}
}