Fallback to default cursor when focused client never set cursor shape

vioken · Oct 30, 2024 · f1cb08e · f1cb08e
1 parent b4555c1
commit f1cb08e
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/server/kernel/wseat.cpp b/src/server/kernel/wseat.cpp
@@ -715,9 +715,12 @@ WGlobal::CursorShape WSeat::requestedCursorShape() const
 {
     W_DC(WSeat);
 
-    if (d->cursorClient == d->nativeHandle()->pointer_state.focused_client)
-        return d->cursorShape;
-    return WGlobal::CursorShape::Invalid;
+    if (d->cursorClient != d->nativeHandle()->pointer_state.focused_client) {
+        qCritical("Focused client never set cursor shape nor surface, will fallback to `Default`");
+        return WGlobal::CursorShape::Default;
+    }
+
+    return d->cursorShape;
 }
 
 WSurface *WSeat::requestedCursorSurface() const