From a7926019eb07f719dd8f9a58761c0eb21c93ee53 Mon Sep 17 00:00:00 2001 From: Fury_Phoenix <64714532+Phoenix-Starlight@users.noreply.github.com> Date: Thu, 25 Jan 2024 19:28:11 -0800 Subject: [PATCH] Account for XDG_CURRENT_DESKTOP being unset (#2273) --- .../caffeinemc/mods/sodium/desktop/utils/browse/GNOMEImpl.java | 3 ++- .../caffeinemc/mods/sodium/desktop/utils/browse/KDEImpl.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/desktop/java/net/caffeinemc/mods/sodium/desktop/utils/browse/GNOMEImpl.java b/src/desktop/java/net/caffeinemc/mods/sodium/desktop/utils/browse/GNOMEImpl.java index 6bf377a7cf..b453efe2cf 100644 --- a/src/desktop/java/net/caffeinemc/mods/sodium/desktop/utils/browse/GNOMEImpl.java +++ b/src/desktop/java/net/caffeinemc/mods/sodium/desktop/utils/browse/GNOMEImpl.java @@ -1,10 +1,11 @@ package net.caffeinemc.mods.sodium.desktop.utils.browse; import java.io.IOException; +import java.util.Objects; class GNOMEImpl implements BrowseUrlHandler { public static boolean isSupported() { - return XDGImpl.isSupported() && System.getenv("XDG_CURRENT_DESKTOP").equals("GNOME"); + return XDGImpl.isSupported() && Objects.equals(System.getenv("XDG_CURRENT_DESKTOP"), "GNOME"); } @Override diff --git a/src/desktop/java/net/caffeinemc/mods/sodium/desktop/utils/browse/KDEImpl.java b/src/desktop/java/net/caffeinemc/mods/sodium/desktop/utils/browse/KDEImpl.java index d62412fdd1..61fb07d037 100644 --- a/src/desktop/java/net/caffeinemc/mods/sodium/desktop/utils/browse/KDEImpl.java +++ b/src/desktop/java/net/caffeinemc/mods/sodium/desktop/utils/browse/KDEImpl.java @@ -1,10 +1,11 @@ package net.caffeinemc.mods.sodium.desktop.utils.browse; import java.io.IOException; +import java.util.Objects; class KDEImpl implements BrowseUrlHandler { public static boolean isSupported() { - return XDGImpl.isSupported() && System.getenv("XDG_CURRENT_DESKTOP").equals("KDE"); + return XDGImpl.isSupported() && Objects.equals(System.getenv("XDG_CURRENT_DESKTOP"), "KDE"); } @Override