Skip to content

Commit

Permalink
fix(dashboard): šŸ› Check for vrserver instead of vrcompositor, fix firā€¦
Browse files Browse the repository at this point in the history
ā€¦st-time startup (#2055)
  • Loading branch information
Meister1593 authored Apr 5, 2024
1 parent a0fe143 commit eb48dfc
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions alvr/dashboard/src/steamvr_launcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,16 @@ pub fn maybe_wrap_vrcompositor_launcher() -> alvr_common::anyhow::Result<()> {
let steamvr_bin_dir = alvr_server_io::steamvr_root_dir()?
.join("bin")
.join("linux64");
let launcher_path = steamvr_bin_dir.join("vrcompositor");
match launcher_path.try_exists() {
let steamvr_vrserver_path = steamvr_bin_dir.join("vrserver");
debug!(
"File path used to check for linux files: {}",
steamvr_vrserver_path.display().to_string()
);
match steamvr_vrserver_path.try_exists() {
Ok(exists) => {
if !exists {
bail!(
"SteamVR linux files missing, aborting startup, please re-check compatibility tools for SteamVR."
"SteamVR linux files missing, aborting startup, please re-check compatibility tools for SteamVR or verify integrity of files for SteamVR."
);
}
}
Expand All @@ -53,6 +57,7 @@ pub fn maybe_wrap_vrcompositor_launcher() -> alvr_common::anyhow::Result<()> {
}
};

let launcher_path = steamvr_bin_dir.join("vrcompositor");
// In case of SteamVR update, vrcompositor will be restored
if fs::read_link(&launcher_path).is_ok() {
fs::remove_file(&launcher_path)?; // recreate the link
Expand Down

0 comments on commit eb48dfc

Please sign in to comment.