Skip to content

Check flatpak runtime dir first on Linux #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0chroma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Check flatpak runtime dir first on Linux #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/bridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ class UnixSocketBridge final : public SlimeVRBridge {
static constexpr std::string_view TMP_DIR = "/tmp";
static constexpr std::string_view XDG_DATA_DIR_DEFAULT = ".local/share";
static constexpr std::string_view SLIMEVR_DATA_DIR = "slimevr";
static constexpr std::string_view SLIMEVR_FLATPAK_RUNTIME_DIR = "app/dev.slimevr.SlimeVR";
static constexpr std::string_view SOCKET_NAME = "SlimeVRInput";
inline static constexpr int HEADER_SIZE = 4;
inline static constexpr int BUFFER_SIZE = 1024;
Expand Down Expand Up @@ -146,7 +147,11 @@ class UnixSocketBridge final : public SlimeVRBridge {
// TODO: do this once in the constructor or something
if(const char* ptr = std::getenv("XDG_RUNTIME_DIR")) {
const fs::path xdg_runtime = ptr;
socket = (xdg_runtime / SOCKET_NAME);
// check flatpak dir first, then root runtime dir
socket = (xdg_runtime / SLIMEVR_FLATPAK_RUNTIME_DIR / SOCKET_NAME);
if(!fs::exists(socket)) {
socket = (xdg_runtime / SOCKET_NAME);
}
}
if(!fs::exists(socket)) {
socket = (fs::path(TMP_DIR) / SOCKET_NAME);
Expand Down