1 files changed, 11 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp
index 964cefe1..b5957069 100644
--- a/src/quicktemplates2/qquickdial.cpp
+++ b/src/quicktemplates2/qquickdial.cpp
@@ -123,6 +123,7 @@ public:
     void handleRelease(const QPointF &point) override;
     void handleUngrab() override;
 
+    void cancelHandle();
     void executeHandle(bool complete = false);
 
     qreal from;
@@ -258,13 +259,19 @@ void QQuickDialPrivate::handleUngrab()
 
 static inline QString handleName() { return QStringLiteral("handle"); }
 
+void QQuickDialPrivate::cancelHandle()
+{
+    Q_Q(QQuickDial);
+    quickCancelDeferred(q, handleName());
+}
+
 void QQuickDialPrivate::executeHandle(bool complete)
 {
     Q_Q(QQuickDial);
     if (handle.wasExecuted())
         return;
 
-    if (!handle)
+    if (!handle || complete)
         quickBeginDeferred(q, handleName(), handle);
     if (complete)
         quickCompleteDeferred(q, handleName(), handle);
@@ -553,6 +560,9 @@ void QQuickDial::setHandle(QQuickItem *handle)
     if (handle == d->handle)
         return;
 
+    if (!d->handle.isExecuting())
+        d->cancelHandle();
+
     delete d->handle;
     d->handle = handle;
     if (d->handle && !d->handle->parentItem())