From b3ff860b19b3a7d6a5dde861f63a7615d2e197d9 Mon Sep 17 00:00:00 2001
From: "Evgeniy A. Dushistov" <dushistov@mail.ru>
Date: Sat, 1 May 2021 00:56:57 +0300
Subject: [PATCH] [drape] check if tree is empty even in kInvalidFrame case

Signed-off-by: Evgeniy A. Dushistov <dushistov@mail.ru>
---
 drape/overlay_tree.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drape/overlay_tree.cpp b/drape/overlay_tree.cpp
index 5ec624ee37..0eda2f600f 100644
--- a/drape/overlay_tree.cpp
+++ b/drape/overlay_tree.cpp
@@ -156,7 +156,11 @@ void OverlayTree::StartOverlayPlacing(ScreenBase const & screen, int zoomLevel)
 bool OverlayTree::Remove(ref_ptr<OverlayHandle> handle)
 {
   if (m_frameCounter == kInvalidFrame)
+  {
+    if (!IsEmpty())
+      Clear();
     return true;
+  }
 
   if (m_handlesCache.find(handle) != m_handlesCache.end())
   {