Blame SOURCES/0046-Do-not-create-decorations-when-the-shellSurface-is-n.patch

b814f0
From b6d85c2a75f5618e87267f5b5c361455be257a17 Mon Sep 17 00:00:00 2001
b814f0
From: Inho Lee <inho.lee@qt.io>
b814f0
Date: Mon, 1 Nov 2021 14:23:58 +0100
b814f0
Subject: [PATCH 46/52] Do not create decorations when the shellSurface is not
b814f0
 ready
b814f0
b814f0
A cases reported that client windows try to make decorations
b814f0
when their shell surfaces are null.
b814f0
Since the surfaces' requests for decorations should be applied,
b814f0
those case will be failed to create decorations.
b814f0
b814f0
This patch was modified by Paul Tvete's advice.
b814f0
(paul.tvete@qt.io)
b814f0
b814f0
Pick-to: 6.2 5.15
b814f0
Task-number: QTBUG-97608
b814f0
Change-Id: I2563dbd73b730f81cc411857af07da99ceb2d063
b814f0
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
b814f0
(cherry picked from commit 246f0c0bc01dd059bf8165e81f7b49efa36e4d95)
b814f0
---
b814f0
 src/client/qwaylandwindow.cpp | 2 +-
b814f0
 1 file changed, 1 insertion(+), 1 deletion(-)
b814f0
b814f0
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
b814f0
index ac01dc05..acfe390e 100644
b814f0
--- a/src/client/qwaylandwindow.cpp
b814f0
+++ b/src/client/qwaylandwindow.cpp
b814f0
@@ -813,7 +813,7 @@ bool QWaylandWindow::createDecoration()
b814f0
         decoration = false;
b814f0
     if (mSubSurfaceWindow)
b814f0
         decoration = false;
b814f0
-    if (mShellSurface && !mShellSurface->wantsDecorations())
b814f0
+    if (!mShellSurface || !mShellSurface->wantsDecorations())
b814f0
         decoration = false;
b814f0
 
b814f0
     bool hadDecoration = mWindowDecoration;
b814f0
-- 
b814f0
2.35.1
b814f0