1 files changed, 35 insertions, 15 deletions

diff --git a/platform/linuxbsd/os_linuxbsd.cpp b/platform/linuxbsd/os_linuxbsd.cpp
index 09a5eca914..e569aa03d7 100644
--- a/platform/linuxbsd/os_linuxbsd.cpp
+++ b/platform/linuxbsd/os_linuxbsd.cpp
@@ -31,8 +31,11 @@
 #include "os_linuxbsd.h"
 
 #include "core/os/dir_access.h"
-#include "core/print_string.h"
-#include "errno.h"
+#include "main/main.h"
+
+#ifdef X11_ENABLED
+#include "display_server_x11.h"
+#endif
 
 #ifdef HAVE_MNTENT
 #include <mntent.h>
@@ -48,12 +51,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "main/main.h"
-
-#ifdef X11_ENABLED
-#include "display_server_x11.h"
-#endif
-
 void OS_LinuxBSD::initialize() {
 	crash_handler.initialize();
 
@@ -91,7 +88,9 @@ void OS_LinuxBSD::finalize() {
 #endif
 
 #ifdef JOYDEV_ENABLED
-	memdelete(joypad);
+	if (joypad) {
+		memdelete(joypad);
+	}
 #endif
 }
 
@@ -124,18 +123,39 @@ String OS_LinuxBSD::get_name() const {
 
 Error OS_LinuxBSD::shell_open(String p_uri) {
 	Error ok;
+	int err_code;
 	List<String> args;
 	args.push_back(p_uri);
-	ok = execute("xdg-open", args, false);
-	if (ok == OK) {
+
+	// Agnostic
+	ok = execute("xdg-open", args, true, nullptr, nullptr, &err_code);
+	if (ok == OK && !err_code) {
+		return OK;
+	} else if (err_code == 2) {
+		return ERR_FILE_NOT_FOUND;
+	}
+	// GNOME
+	args.push_front("open"); // The command is `gio open`, so we need to add it to args
+	ok = execute("gio", args, true, nullptr, nullptr, &err_code);
+	if (ok == OK && !err_code) {
+		return OK;
+	} else if (err_code == 2) {
+		return ERR_FILE_NOT_FOUND;
+	}
+	args.pop_front();
+	ok = execute("gvfs-open", args, true, nullptr, nullptr, &err_code);
+	if (ok == OK && !err_code) {
 		return OK;
+	} else if (err_code == 2) {
+		return ERR_FILE_NOT_FOUND;
 	}
-	ok = execute("gnome-open", args, false);
-	if (ok == OK) {
+	// KDE
+	ok = execute("kde-open5", args, true, nullptr, nullptr, &err_code);
+	if (ok == OK && !err_code) {
 		return OK;
 	}
-	ok = execute("kde-open", args, false);
-	return ok;
+	ok = execute("kde-open", args, true, nullptr, nullptr, &err_code);
+	return !err_code ? ok : FAILED;
 }
 
 bool OS_LinuxBSD::_check_internal_feature_support(const String &p_feature) {