From 2245a8dbb057811258b6ab5da842b8f547bdd3f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Tue, 7 Mar 2023 00:18:17 +0100 Subject: [PATCH] wasm: restore windowCursor nullptr check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This check was accidentally removed in commit 783b63ce. If the cursor is null, set the default cursor. Pick-to: 6.5 6.5.0 Change-Id: I894d5e04cd7b49041bd0d3b59fc816a8b7efffe7 Reviewed-by: MikoĊ‚aj Boc --- src/plugins/platforms/wasm/qwasmcursor.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/platforms/wasm/qwasmcursor.cpp b/src/plugins/platforms/wasm/qwasmcursor.cpp index 1ffa00780dd..b341a31b0ca 100644 --- a/src/plugins/platforms/wasm/qwasmcursor.cpp +++ b/src/plugins/platforms/wasm/qwasmcursor.cpp @@ -75,11 +75,10 @@ QByteArray cursorShapeToCss(Qt::CursorShape shape) void QWasmCursor::changeCursor(QCursor *windowCursor, QWindow *window) { - if (!window || !window->handle()) + if (!window) return; - - static_cast(window->handle()) - ->setWindowCursor(cursorShapeToCss(windowCursor->shape())); + if (QWasmWindow *wasmWindow = static_cast(window->handle())) + wasmWindow->setWindowCursor(windowCursor ? cursorShapeToCss(windowCursor->shape()) : "default"); } QT_END_NAMESPACE