From 9cd30a65511b999b35b580bc925193d3543e0f62 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sat, 16 Feb 2019 22:32:19 +0200 Subject: [PATCH] fix warnings from VDs in ContextMenu --- plasmoid/package/contents/ui/ContextMenu.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plasmoid/package/contents/ui/ContextMenu.qml b/plasmoid/package/contents/ui/ContextMenu.qml index 6c5d064ff..7500a717a 100644 --- a/plasmoid/package/contents/ui/ContextMenu.qml +++ b/plasmoid/package/contents/ui/ContextMenu.qml @@ -335,7 +335,8 @@ PlasmaComponents.ContextMenu { menuItem.text = i18n("Move To Current Desktop"); menuItem.enabled = Qt.binding(function() { if (root.plasma515) { - return menu.visualParent && menu.get(atm.VirtualDesktops).indexOf(virtualDesktopInfo.currentDesktop) == -1; + var vds = menu.get(atm.VirtualDesktops); + return menu.visualParent && (vds !== undefined) && vds.indexOf(virtualDesktopInfo.currentDesktop) == -1; } else { return menu.visualParent && menu.get(atm.VirtualDesktop) !== virtualDesktopInfo.currentDesktop; } @@ -373,7 +374,8 @@ PlasmaComponents.ContextMenu { menuItem.checked = Qt.binding((function(i) { return function() { if (root.plasma515) { - return (menu.visualParent && menu.get(atm.VirtualDesktops).indexOf(virtualDesktopInfo.desktopIds[i]) > -1); + var vds = menu.get(atm.VirtualDesktops); + return (menu.visualParent && (vds !== undefined) && vds.indexOf(virtualDesktopInfo.desktopIds[i]) > -1); } else { return (menu.visualParent && menu.get(atm.VirtualDesktop) === (i + 1)); }