From 716867475ce17d1131e09d61c39ab0f6a367101d Mon Sep 17 00:00:00 2001 From: Devin Lin Date: Sun, 5 Mar 2023 23:06:35 -0800 Subject: [PATCH] homescreens/halcyon: Fix crash on favourite reorder --- containments/homescreens/halcyon/package/contents/ui/main.qml | 1 + containments/homescreens/halcyon/plugin/pinnedmodel.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/containments/homescreens/halcyon/package/contents/ui/main.qml b/containments/homescreens/halcyon/package/contents/ui/main.qml index 95523fa0..32928578 100644 --- a/containments/homescreens/halcyon/package/contents/ui/main.qml +++ b/containments/homescreens/halcyon/package/contents/ui/main.qml @@ -26,6 +26,7 @@ MobileShell.HomeScreen { Component.onCompleted: { Halcyon.ApplicationListModel.loadApplications(); + Halcyon.PinnedModel.applet = plasmoid.nativeInterface; forceActiveFocus(); } diff --git a/containments/homescreens/halcyon/plugin/pinnedmodel.cpp b/containments/homescreens/halcyon/plugin/pinnedmodel.cpp index a561135c..8504ed50 100644 --- a/containments/homescreens/halcyon/plugin/pinnedmodel.cpp +++ b/containments/homescreens/halcyon/plugin/pinnedmodel.cpp @@ -130,6 +130,9 @@ void PinnedModel::moveEntry(int fromRow, int toRow) save(); // HACK: didn't seem to persist + if (!m_applet) { + return; + } m_applet->config().sync(); }