From 9efcb5d290465b6eec2497a019f72eca97856984 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 2 Nov 2020 21:26:38 +0000 Subject: [PATCH] LibGUI: Return early if drag_data_type is null (#3919) If the user tries to drag an item with a null drag data type from an AbstractView, return from the mouse event early. --- Libraries/LibGUI/AbstractView.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Libraries/LibGUI/AbstractView.cpp b/Libraries/LibGUI/AbstractView.cpp index 85406738c6..3b43047a7a 100644 --- a/Libraries/LibGUI/AbstractView.cpp +++ b/Libraries/LibGUI/AbstractView.cpp @@ -265,6 +265,10 @@ void AbstractView::mousemove_event(MouseEvent& event) auto hovered_index = index_at_event_position(event.position()); set_hovered_index(hovered_index); + auto data_type = m_model->drag_data_type(); + if (data_type.is_null()) + return ScrollableWidget::mousemove_event(event); + if (!m_might_drag) return ScrollableWidget::mousemove_event(event); @@ -280,7 +284,6 @@ void AbstractView::mousemove_event(MouseEvent& event) if (distance_travelled_squared <= drag_distance_threshold) return ScrollableWidget::mousemove_event(event); - auto data_type = m_model->drag_data_type(); ASSERT(!data_type.is_null()); dbg() << "Initiate drag!";