From 064097a45b12088ee7af97a140ca7cefdb6d9c4f Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Thu, 1 Feb 2018 18:46:25 +0300 Subject: [PATCH] Fixed crash with follow and rotate event. --- drape_frontend/frontend_renderer.cpp | 3 +-- drape_frontend/user_event_stream.hpp | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp index 370d67b24a..a26025efb2 100755 --- a/drape_frontend/frontend_renderer.cpp +++ b/drape_frontend/frontend_renderer.cpp @@ -2046,8 +2046,7 @@ void FrontendRenderer::ChangeModelView(m2::PointD const & userPos, double azimut void FrontendRenderer::ChangeModelView(double autoScale, m2::PointD const & userPos, double azimuth, m2::PointD const & pxZero, TAnimationCreator const & parallelAnimCreator) { - AddUserEvent(make_unique_dp(userPos, pxZero, azimuth, autoScale, - nullptr, parallelAnimCreator)); + AddUserEvent(make_unique_dp(userPos, pxZero, azimuth, autoScale, parallelAnimCreator)); } ScreenBase const & FrontendRenderer::ProcessEvents(bool & modelViewChanged, bool & viewportChanged) diff --git a/drape_frontend/user_event_stream.hpp b/drape_frontend/user_event_stream.hpp index 75c6144156..8924bcbd26 100644 --- a/drape_frontend/user_event_stream.hpp +++ b/drape_frontend/user_event_stream.hpp @@ -217,7 +217,7 @@ class FollowAndRotateEvent : public UserEvent public: FollowAndRotateEvent(m2::PointD const & userPos, m2::PointD const & pixelZero, double azimuth, double autoScale, - TAnimationCreator const & parallelAnimCreator = nullptr) + TAnimationCreator const & parallelAnimCreator) : m_userPos(userPos) , m_pixelZero(pixelZero) , m_azimuth(azimuth) @@ -232,8 +232,8 @@ public: FollowAndRotateEvent(m2::PointD const & userPos, m2::PointD const & pixelZero, double azimuth, int preferredZoomLevel, - bool isAnim, Animation::TAction const & onFinishAction = nullptr, - TAnimationCreator const & parallelAnimCreator = nullptr) + bool isAnim, Animation::TAction const & onFinishAction, + TAnimationCreator const & parallelAnimCreator) : m_userPos(userPos) , m_pixelZero(pixelZero) , m_azimuth(azimuth)