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

QWaylandWindow: prevent a crash when calling requestXdgActivationToken

Browse Source 
It could crash if it's called when there's no mShellSurface

Pick-to: 6.9 6.8
Change-Id: I9b279e915ea661b121da672ebd46be458a1a9218
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
Ilya Fedin 2024-12-21 11:49:56 +04:00
parent faea5e128a
commit 71c4dab8d0
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -1787,12 +1787,20 @@ void QWaylandWindow::setOpaqueArea(const QRegion &opaqueArea)
void QWaylandWindow::requestXdgActivationToken(uint serial) void QWaylandWindow::requestXdgActivationToken(uint serial)
{ {
if (!mShellSurface) {
qCWarning(lcQpaWayland) << "requestXdgActivationToken is called with no surface role created, emitting synthetic signal";
Q_EMIT xdgActivationTokenCreated({});
return;
}
mShellSurface->requestXdgActivationToken(serial); mShellSurface->requestXdgActivationToken(serial);
} }
void QWaylandWindow::setXdgActivationToken(const QString &token) void QWaylandWindow::setXdgActivationToken(const QString &token)
{ {
if (mShellSurface)
mShellSurface->setXdgActivationToken(token); mShellSurface->setXdgActivationToken(token);
else
qCWarning(lcQpaWayland) << "setXdgActivationToken is called with no surface role created, token" << token << "discarded";
} }
void QWaylandWindow::addChildPopup(QWaylandWindow *child) void QWaylandWindow::addChildPopup(QWaylandWindow *child)