From 6adbe5249d1ab3b163489ca8eb5c7a468c8a48c5 Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Fri, 7 Feb 2020 13:38:02 +0100
Subject: [PATCH] Fix warnings

---
 .../panel/package/contents/ui/indicators/Volume.qml         | 2 +-
 containments/taskpanel/package/contents/ui/main.qml         | 4 ++--
 shell/contents/views/Desktop.qml                            | 6 +++---
 shell/contents/views/Panel.qml                              | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/containments/panel/package/contents/ui/indicators/Volume.qml b/containments/panel/package/contents/ui/indicators/Volume.qml
index d9d2de8c..0283cebc 100644
--- a/containments/panel/package/contents/ui/indicators/Volume.qml
+++ b/containments/panel/package/contents/ui/indicators/Volume.qml
@@ -40,7 +40,7 @@ PlasmaCore.IconItem {
 
     colorGroup: PlasmaCore.ColorScope.colorGroup
 
-    visible: paSinkModel.preferredSink.muted
+    visible: paSinkModel.preferredSink && paSinkModel.preferredSink.muted
 
     function iconName(volume, muted, prefix) {
         if (!prefix) {
diff --git a/containments/taskpanel/package/contents/ui/main.qml b/containments/taskpanel/package/contents/ui/main.qml
index e2d5d226..1d28e0df 100644
--- a/containments/taskpanel/package/contents/ui/main.qml
+++ b/containments/taskpanel/package/contents/ui/main.qml
@@ -150,7 +150,7 @@ PlasmaCore.ColorScope {
                 anchors.left: parent.left
                 height: parent.height
                 width: parent.width/3
-                enabled: taskSwitcher.tasksCount > 0;
+                enabled: taskSwitcher && taskSwitcher.tasksCount > 0;
                 iconSource: "box"
                 onClicked: {
                     plasmoid.nativeInterface.showDesktop = false;
@@ -167,7 +167,7 @@ PlasmaCore.ColorScope {
                 width: parent.width/3
                 anchors.horizontalCenter: parent.horizontalCenter
                 iconSource: "start-here-kde"
-                enabled: taskSwitcher.tasksCount > 0
+                enabled: taskSwitcher && taskSwitcher.tasksCount > 0
                 checkable: true
                 onCheckedChanged: {
                     taskSwitcher.hide();
diff --git a/shell/contents/views/Desktop.qml b/shell/contents/views/Desktop.qml
index 08a75fc7..9514b81d 100644
--- a/shell/contents/views/Desktop.qml
+++ b/shell/contents/views/Desktop.qml
@@ -165,7 +165,7 @@ Item {
         PlasmaComponents.Label {
             id: activityNameLabel
             anchors.centerIn: parent
-            text: activitiesView.nextContainment.activityName
+            text: activitiesView.nextContainment ? activitiesView.nextContainment.activityName : ""
         }
         Behavior on opacity {
             OpacityAnimator {
@@ -226,8 +226,8 @@ Item {
         id: pinOverlay
         anchors {
             fill: parent
-            topMargin: containment.availableScreenRect.y
-            bottomMargin: parent.height - containment.availableScreenRect.height - containment.availableScreenRect.y
+            topMargin: containment ? containment.availableScreenRect.y : 0
+            bottomMargin: parent.height - containment ? (containment.availableScreenRect.height + containment.availableScreenRect.y) : 0
         }
         z: 222
         source: Qt.resolvedUrl("Pin.qml")
diff --git a/shell/contents/views/Panel.qml b/shell/contents/views/Panel.qml
index 746a2ba5..b4958a10 100644
--- a/shell/contents/views/Panel.qml
+++ b/shell/contents/views/Panel.qml
@@ -27,7 +27,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
 
     onContainmentChanged: {
         containment.parent = root;