Picking: don’t emit click if mouse released on different entity

Task-number: QTBUG-59582
Change-Id: I88e49add59d1caa3167576c8f0c014dd61211f29
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/render/jobs/pickboundingvolumejob.cpp b/src/render/jobs/pickboundingvolumejob.cpp
index edc847bc4..7bd45587c 100644
--- a/src/render/jobs/pickboundingvolumejob.cpp
+++ b/src/render/jobs/pickboundingvolumejob.cpp
@@ -362,13 +362,12 @@ void PickBoundingVolumeJob::dispatchPickEvents(const QMouseEvent &event,
                 }
 
                 case QEvent::MouseButtonRelease: {
-                    if (lastCurrentPicker != nullptr && m_currentPicker == objectPickerHandle)
-                        m_currentPicker = HObjectPicker();
                     // Only send the release event if it was pressed
-                    if (objectPicker->isPressed()) {
-                        if (lastCurrentPicker == objectPicker)
-                            objectPicker->onClicked(pickEvent);
+                    if (objectPicker->isPressed())
                         objectPicker->onReleased(pickEvent);
+                    if (lastCurrentPicker != nullptr && m_currentPicker == objectPickerHandle) {
+                        objectPicker->onClicked(pickEvent);
+                        m_currentPicker = HObjectPicker();
                     }
                     break;
                 }