Skip to content
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

fix(dashboard): 🐛 Check for vrserver instead of vrcompositor, fix first-time startup #2055

Merged
merged 1 commit into from
Apr 5, 2024
Merged

fix(dashboard): 🐛 Check for vrserver instead of vrcompositor, fix first-time startup #2055

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
11 changes: 8 additions & 3 deletions alvr/dashboard/src/steamvr_launcher.rs
View file
Open in desktop
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
Loading