1 files changed, 11 insertions, 2 deletions
diff --git a/src/location/declarativemaps/qquickgeomapgesturearea.cpp b/src/location/declarativemaps/qquickgeomapgesturearea.cpp
index c2782f36..c0dbe0ad 100644
--- a/src/location/declarativemaps/qquickgeomapgesturearea.cpp
+++ b/src/location/declarativemaps/qquickgeomapgesturearea.cpp
@@ -702,8 +702,10 @@ void QQuickGeoMapGestureArea::setPanEnabled(bool enabled)
     m_flick.m_panEnabled = enabled;
 
     // unlike the pinch, the pan existing functionality is to stop immediately
-    if (!enabled)
+    if (!enabled) {
         stopPan();
+        m_flickState = flickInactive;
+    }
 }
 
 /*!
@@ -724,7 +726,14 @@ void QQuickGeoMapGestureArea::setFlickEnabled(bool enabled)
     m_flick.m_flickEnabled = enabled;
     // unlike the pinch, the flick existing functionality is to stop immediately
     if (!enabled) {
-         stopFlick();
+        bool stateActive = (m_flickState != flickInactive);
+        stopFlick();
+        if (stateActive) {
+            if (m_flick.m_panEnabled)
+                m_flickState = panActive;
+            else
+                m_flickState = flickInactive;
+        }
     }
 }