From cb229f64360502c6774e7242fa353254dcacc931 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Mon, 20 Mar 2023 22:26:49 +0000 Subject: [PATCH] compositor: adjust xdp error cases --- src/Compositor.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 5650a657..94b8eb40 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -2294,11 +2294,16 @@ int CCompositor::getNewSpecialID() { } void CCompositor::performUserChecks() { - static constexpr auto BAD_PORTALS = {"kde", "gnome", "wlr"}; + static constexpr auto BAD_PORTALS = {"kde", "gnome"}; if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/" + portal + ".portal"); })) { // bad portal detected g_pHyprNotificationOverlay->addNotification("You have one or more incompatible xdg-desktop-portal impls installed. Please remove incompatible ones to avoid issues.", CColor(0), 15000, ICON_ERROR); } + + if (std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/hyprland.portal") && std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/wlr.portal")) { + g_pHyprNotificationOverlay->addNotification("You have xdg-desktop-portal-hyprland and -wlr installed simultaneously. Please uninstall one to avoid issues.", CColor(0), + 15000, ICON_ERROR); + } }