diff --git a/gui/electron/main/paths.ts b/gui/electron/main/paths.ts index fb5a17be1..e917a3995 100644 --- a/gui/electron/main/paths.ts +++ b/gui/electron/main/paths.ts @@ -50,14 +50,19 @@ export const getLogsFolder = () => { export const getExeFolder = () => { return path.dirname(app.getPath('exe')); -} +}; export const getWindowStateFile = () => join(getServerDataFolder(), '.window-state.json'); const localJavaBin = (sharedDir: string) => { - const jre = join(sharedDir, 'jre/bin', javaBin); - return jre; + const platform = getPlatform(); + switch (platform) { + case 'macos': + return join(sharedDir, '../../../../jre/Contents/Home/bin', javaBin); + default: + return join(sharedDir, 'jre/bin', javaBin); + } }; const javaHomeBin = () => { @@ -116,6 +121,9 @@ export const findServerJar = () => { // For flatpack container path.resolve('/app/share/slimevr/'), path.resolve('/usr/share/slimevr/'), + + // For macos on steam + path.resolve(`${app.getPath('exe')}/../../../../`), ]; return paths .filter((p) => !!p) diff --git a/solarxr-protocol b/solarxr-protocol index f5ab1bb21..088daeeaa 160000 --- a/solarxr-protocol +++ b/solarxr-protocol @@ -1 +1 @@ -Subproject commit f5ab1bb21401be84f4768e5fb348dfbf8ffe07a8 +Subproject commit 088daeeaa1810cc54cb60b8ad45aee95033af78b