diff options
-rw-r--r-- | src/widgets/widgets/qlabel.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index 2d7b7f79b1..189a7488d3 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -1694,14 +1694,13 @@ QPoint QLabelPrivate::layoutPoint(const QPoint& p) const #ifndef QT_NO_CONTEXTMENU QMenu *QLabelPrivate::createStandardContextMenu(const QPoint &pos) { - QString linkToCopy; - QPoint p; - if (control && effectiveTextFormat != Qt::PlainText) { - p = layoutPoint(pos); - linkToCopy = control->document()->documentLayout()->anchorAt(p); - } + if (!control || effectiveTextFormat == Qt::PlainText) + return nullptr; + + const QPoint p = layoutPoint(pos); + QString linkToCopy = control->document()->documentLayout()->anchorAt(p); - if (linkToCopy.isEmpty() && !control) + if (linkToCopy.isEmpty()) return nullptr; return control->createStandardContextMenu(p, q_func()); |