From 561f0168c0c05627fbb888e7d845906db34405b0 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Fri, 5 Feb 2021 17:06:12 +0200
Subject: [PATCH] fixes for abilities and KHNS

---
 app/settings/handlers/tablayoutshandler.cpp      | 3 ++-
 declarativeimports/abilities/items/BasicItem.qml | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/settings/handlers/tablayoutshandler.cpp b/app/settings/handlers/tablayoutshandler.cpp
index 1b21b2846..3e6d3cdfe 100644
--- a/app/settings/handlers/tablayoutshandler.cpp
+++ b/app/settings/handlers/tablayoutshandler.cpp
@@ -439,9 +439,10 @@ void TabLayouts::downloadLayout()
     dialog.resize(m_parentDialog->downloadWindowSize());
     dialog.exec();
 
-    if (!dialog.changedEntries().isEmpty() || !dialog.installedEntries().isEmpty()) {
+    if (!dialog.changedEntries().isEmpty() && !dialog.installedEntries().isEmpty()) {
         for (const auto &entry : dialog.installedEntries()) {
             for (const auto &entryFile : entry.installedFiles()) {
+                qDebug() << "org.kde.latte :::  installing :: " << entryFile;
                 Latte::Layouts::Importer::LatteFileVersion version = Latte::Layouts::Importer::fileVersion(entryFile);
 
                 if (version == Latte::Layouts::Importer::LayoutVersion2) {
diff --git a/declarativeimports/abilities/items/BasicItem.qml b/declarativeimports/abilities/items/BasicItem.qml
index f8797340c..3c12dd259 100644
--- a/declarativeimports/abilities/items/BasicItem.qml
+++ b/declarativeimports/abilities/items/BasicItem.qml
@@ -111,10 +111,10 @@ Item{
     readonly property bool parabolicAreaContainsMouse: parabolicEventsAreaLoader.active && parabolicEventsAreaLoader.item.containsMouse
 
     readonly property int location: {
-        if (abilityItem.location === PlasmaCore.Types.LeftEdge
-                || abilityItem.location === PlasmaCore.Types.RightEdge
-                || abilityItem.location === PlasmaCore.Types.TopEdge) {
-            return abilityItem.location;
+        if (plasmoid.location === PlasmaCore.Types.LeftEdge
+                || plasmoid.location === PlasmaCore.Types.RightEdge
+                || plasmoid.location === PlasmaCore.Types.TopEdge) {
+            return plasmoid.location;
         }
 
         return PlasmaCore.Types.BottomEdge;