2023-06-26 23:51:04 +02:00
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
2023-08-05 11:46:50 +02:00
index 1d978aed..56665389 100644
2023-06-26 23:51:04 +02:00
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
2023-08-05 11:46:50 +02:00
@@ -2365,17 +2365,16 @@ void CCompositor::performUserChecks() {
2023-06-26 23:51:04 +02:00
static auto* const PSUPPRESSPORTAL = &g_pConfigManager->getConfigValuePtr("misc:suppress_portal_warnings")->intValue;
2023-06-30 09:13:26 +02:00
- if (!*PSUPPRESSPORTAL) {
2023-06-26 23:51:04 +02:00
- if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/" + portal + ".portal"); })) {
2023-06-30 09:13:26 +02:00
+ static auto* const PORTALDIRENV = getenv("XDG_DESKTOP_PORTAL_DIR");
+
+ static auto const PORTALDIR = PORTALDIRENV != NULL ? std::string(PORTALDIRENV) : "";
+
+ if (!*PSUPPRESSPORTAL && PORTALDIR != "") {
2023-06-26 23:51:04 +02:00
+ if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists(PORTALDIR + "/" + 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);
}
2023-08-05 11:46:50 +02:00
-
2023-06-26 23:51:04 +02:00
- if (std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/hyprland.portal") && std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/wlr.portal")) {
2023-08-05 11:46:50 +02:00
- g_pHyprNotificationOverlay->addNotification("You have xdg-desktop-portal-hyprland and -wlr installed simultaneously. Please uninstall one to avoid issues.", CColor(0),
- 15000, ICON_ERROR);
- }
}
}