From aa4103f72a1719bc600e49986ef97ae287afe079 Mon Sep 17 00:00:00 2001 From: Marco Allegretti Date: Sat, 18 Apr 2026 20:24:28 +0200 Subject: [PATCH] Add null guards in QuickSettingsDelegate and convergentwindows Check restrictedPermissions before opening the detail popup in convergence mode. Guard against null output in the KWin script window-setup handler to prevent TypeError when a window has no assigned output yet. --- .../qml/actiondrawer/private/QuickSettingsDelegate.qml | 2 +- kwin/scripts/convergentwindows/contents/ui/main.qml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/mobileshell/qml/actiondrawer/private/QuickSettingsDelegate.qml b/components/mobileshell/qml/actiondrawer/private/QuickSettingsDelegate.qml index ad5a3266..4cb2879c 100644 --- a/components/mobileshell/qml/actiondrawer/private/QuickSettingsDelegate.qml +++ b/components/mobileshell/qml/actiondrawer/private/QuickSettingsDelegate.qml @@ -101,7 +101,7 @@ MobileShell.BaseItem { function delegatePressAndHold() { // In convergence mode, show inline detail popup if available. - if (ShellSettings.Settings.convergenceModeEnabled && root.settingsCommand) { + if (ShellSettings.Settings.convergenceModeEnabled && root.settingsCommand && !root.restrictedPermissions) { let pluginId = __appletForCommand[root.settingsCommand]; if (pluginId) { root.detailRequested(pluginId); diff --git a/kwin/scripts/convergentwindows/contents/ui/main.qml b/kwin/scripts/convergentwindows/contents/ui/main.qml index 3a701f89..4bc06e1e 100644 --- a/kwin/scripts/convergentwindows/contents/ui/main.qml +++ b/kwin/scripts/convergentwindows/contents/ui/main.qml @@ -31,6 +31,7 @@ Loader { const output = window.output const desktop = window.desktops[0] + if (!output) return if (!desktop) return const maxRect = KWinComponents.Workspace.clientArea(