summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/animationnodes/animationaudionode.cxx6
-rw-r--r--slideshow/source/engine/animationnodes/basenode.cxx4
-rw-r--r--slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx2
3 files changed, 6 insertions, 6 deletions
diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx b/slideshow/source/engine/animationnodes/animationaudionode.cxx
index 1dcd4cf7181b..a548fd20f97e 100644
--- a/slideshow/source/engine/animationnodes/animationaudionode.cxx
+++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx
@@ -89,7 +89,7 @@ void AnimationAudioNode::activate_st()
// deactivate ASAP:
auto self(getSelf());
scheduleDeactivationEvent(
- makeEvent( [self] () { self->deactivate(); },
+ makeEvent( [self=std::move(self)] () { self->deactivate(); },
"AnimationAudioNode::deactivate without delay") );
}
}
@@ -188,13 +188,13 @@ bool AnimationAudioNode::handleAnimationEvent(
void AnimationAudioNode::checkPlayingStatus()
{
- auto self(getSelf());
+ auto xSelf(getSelf());
double nDuration = mpPlayer->getDuration();
if (!mpPlayer->isPlaying() || nDuration < 0.0)
nDuration = 0.0;
scheduleDeactivationEvent(
- makeDelay( [self] () { self->deactivate(); },
+ makeDelay( [xSelf=std::move(xSelf)] () { xSelf->deactivate(); },
nDuration,
"AnimationAudioNode::deactivate with delay") );
}
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx
index 9e812ecfc794..1da302008138 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -462,7 +462,7 @@ bool BaseNode::resolve()
if (aBegin.hasValue()) {
auto self(mpSelf);
mpCurrentEvent = generateEvent(
- aBegin, [self] () { self->activate(); },
+ aBegin, [self=std::move(self)] () { self->activate(); },
maContext, mnStartDelay );
}
else {
@@ -474,7 +474,7 @@ bool BaseNode::resolve()
// timeout into account
auto self(mpSelf);
mpCurrentEvent = makeDelay(
- [self] () { self->activate(); },
+ [self=std::move(self)] () { self->activate(); },
mnStartDelay,
"AnimationNode::activate with delay");
maContext.mrEventQueue.addEvent( mpCurrentEvent );
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
index 3f928593c846..5b1eecf79d31 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
@@ -43,7 +43,7 @@ void SequentialTimeContainer::activate_st()
// deactivate ASAP:
auto self(getSelf());
scheduleDeactivationEvent(
- makeEvent( [self] () { self->deactivate(); },
+ makeEvent( [self=std::move(self)] () { self->deactivate(); },
"SequentialTimeContainer::deactivate") );
}
else // use default