diff --git a/map/balloon_manager.cpp b/map/balloon_manager.cpp index b34e05d7e4..dc7ceb47c4 100644 --- a/map/balloon_manager.cpp +++ b/map/balloon_manager.cpp @@ -366,5 +366,7 @@ void PinClickManager::OnAdditonalLayer(size_t index) void PinClickManager::OnDismiss() { - m_dismissListener(); + // Can be called before the listeners will be attached (clearing on activity start). + if (m_dismissListener) + m_dismissListener(); }