diff --git a/src/Gui/NavigationAnimation.cpp b/src/Gui/NavigationAnimation.cpp index 8b999a7280..f779eca2c7 100644 --- a/src/Gui/NavigationAnimation.cpp +++ b/src/Gui/NavigationAnimation.cpp @@ -28,18 +28,17 @@ using namespace Gui; NavigationAnimation::NavigationAnimation(NavigationStyle* navigation) - : navigation(navigation), started(false) + : navigation(navigation) {} void NavigationAnimation::startAnimation(QAbstractAnimation::DeletionPolicy policy) { - started = true; QAbstractAnimation::start(policy); } void NavigationAnimation::updateCurrentValue(const QVariant& value) { - if (!started) { + if (state() == QAbstractAnimation::State::Stopped) { return; } update(value); diff --git a/src/Gui/NavigationAnimation.h b/src/Gui/NavigationAnimation.h index 0488db5ed6..5a1c33b438 100644 --- a/src/Gui/NavigationAnimation.h +++ b/src/Gui/NavigationAnimation.h @@ -45,8 +45,6 @@ protected: virtual void stopAnimation(); private: - bool started; - void startAnimation(QAbstractAnimation::DeletionPolicy policy = KeepWhenStopped); void updateCurrentValue(const QVariant& value) override; diff --git a/src/Gui/NavigationAnimator.cpp b/src/Gui/NavigationAnimator.cpp index aa690c708f..0c984647e8 100644 --- a/src/Gui/NavigationAnimator.cpp +++ b/src/Gui/NavigationAnimator.cpp @@ -94,7 +94,6 @@ void NavigationAnimator::stop() */ void NavigationAnimator::reset() { disconnect(activeAnimation.get(), &NavigationAnimation::finished, 0, 0); - activeAnimation->started = false; activeAnimation->stopAnimation(); activeAnimation.reset(); }