From ed2afa2932ddfdfb5aa944f1bcccdd308d952abd Mon Sep 17 00:00:00 2001 From: plyshka Date: Mon, 1 Apr 2024 18:01:57 +0500 Subject: [PATCH] =?UTF-8?q?fix(dashboard):=20=F0=9F=90=9B=20Check=20for=20?= =?UTF-8?q?vrserver=20instead=20of=20vrcompositor,=20fix=20first-time=20st?= =?UTF-8?q?artup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alvr/dashboard/src/steamvr_launcher.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/alvr/dashboard/src/steamvr_launcher.rs b/alvr/dashboard/src/steamvr_launcher.rs index e254256a80..f70e142450 100644 --- a/alvr/dashboard/src/steamvr_launcher.rs +++ b/alvr/dashboard/src/steamvr_launcher.rs @@ -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." ); } } @@ -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