From 59297a25f316d772f0e7e18ee7ce29c703cd58c5 Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Wed, 24 Feb 2021 16:04:24 +0100
Subject: [PATCH] --warnings

Make sure we don't call null pointers
Do not reference old objects that don't exist anymore
---
 shell/contents/views/Desktop.qml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/shell/contents/views/Desktop.qml b/shell/contents/views/Desktop.qml
index 961853ec..14f109c1 100644
--- a/shell/contents/views/Desktop.qml
+++ b/shell/contents/views/Desktop.qml
@@ -36,7 +36,7 @@ Rectangle {
     visible: false //adjust borders is run during setup. We want to avoid painting till completed
     property Item containment
 
-    color: containment.backgroundHints == PlasmaCore.Types.NoBackground ? "transparent" : theme.textColor
+    color: (containment && containment.backgroundHints == PlasmaCore.Types.NoBackground) ? "transparent" : theme.textColor
 
     function toggleWidgetExplorer(containment) {
         console.log("Widget Explorer toggled");
@@ -75,7 +75,7 @@ Rectangle {
         anchors {
             fill: parent
             topMargin: containment ? containment.availableScreenRect.y : 0
-            bottomMargin: parent.height - containment ? (containment.availableScreenRect.height + containment.availableScreenRect.y) : 0
+            bottomMargin: parent.height - (containment ? (containment.availableScreenRect.height + containment.availableScreenRect.y) : 0)
         }
         z: 222
         source: Qt.resolvedUrl("Pin.qml")
@@ -85,7 +85,6 @@ Rectangle {
         containment.parent = root;
         containment.visible = true;
         containment.anchors.fill = root;
-        panel.backgroundHints = containment.backgroundHints;
     }
 
     Component.onCompleted: {