1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

datacontrolv1: reset offer if receive null selection

Browse Source 
Change-Id: Ifc88b5cb54299df9177afe6ed9bcaa46b1fe21fb
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
Jie Liu 2024-11-29 11:25:33 +08:00
parent 936260bbb9
commit 6d3f6d3ae5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/wayland/qwaylanddatacontrolv1.cpp
View File

@ -96,8 +96,9 @@ void QWaylandDataControlDeviceV1::zwlr_data_control_device_v1_data_offer(zwlr_da
void QWaylandDataControlDeviceV1::zwlr_data_control_device_v1_selection(zwlr_data_control_offer_v1 *id)
{
if (!id)
return;
m_selectionOffer.reset(static_cast<QWaylandDataControlOfferV1 *>(zwlr_data_control_offer_v1_get_user_data(id)));
m_selectionOffer.reset();
else
m_selectionOffer.reset(static_cast<QWaylandDataControlOfferV1 *>(zwlr_data_control_offer_v1_get_user_data(id)));
// The selection event may be sent before platfrmIntegration is set.
if (auto* integration = QGuiApplicationPrivate::platformIntegration())
@ -114,8 +115,9 @@ void QWaylandDataControlDeviceV1::zwlr_data_control_device_v1_finished()
void QWaylandDataControlDeviceV1::zwlr_data_control_device_v1_primary_selection(struct ::zwlr_data_control_offer_v1 *id)
{
if (!id)
return;
m_primarySelectionOffer.reset(static_cast<QWaylandDataControlOfferV1 *>(zwlr_data_control_offer_v1_get_user_data(id)));
m_primarySelectionOffer.reset();
else
m_primarySelectionOffer.reset(static_cast<QWaylandDataControlOfferV1 *>(zwlr_data_control_offer_v1_get_user_data(id)));
// The selection event may be sent before platfrmIntegration is set.
if (auto* integration = QGuiApplicationPrivate::platformIntegration())