Fix issues with no installation of Steam. Allows for broader Desktop …

…use.
Soapwood · Aug 1, 2024 · 324890d · 324890d
1 parent 528f300
commit 324890d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/VXMusicDesktop/Core/SteamVROverlayAppsInterface.cs b/VXMusicDesktop/Core/SteamVROverlayAppsInterface.cs
@@ -18,6 +18,9 @@ public class SteamVROverlayAppsInterface
 
     private string SteamAppConfigPath;
     private string SteamInstallPath;
+
+    public bool SteamAppConfigPathExists => Directory.Exists(SteamAppConfigPath);
+    public bool SteamInstallPathExists => Directory.Exists(SteamInstallPath);
 
     private static readonly string SteamRegistryValue = "SteamPath";
     private static readonly string SteamRegistryKey = @"HKEY_CURRENT_USER\Software\Valve\Steam";
@@ -31,8 +34,9 @@ public SteamVROverlayAppsInterface(IServiceProvider serviceProvider)
         _logger.LogTrace("Creating SteamVROverlayAppsInterface.");
 
         SteamInstallPath = GetSteamInstallationPath();
-
-        SteamAppConfigPath = Path.GetFullPath(Path.Combine(SteamInstallPath, "config", "appconfig.json"));
+
+        if(!string.IsNullOrEmpty(SteamInstallPath))
+            SteamAppConfigPath = Path.GetFullPath(Path.Combine(SteamInstallPath, "config", "appconfig.json"));
     }
 
     public bool InstallVxMusicAsSteamVrOverlay()
@@ -44,6 +48,10 @@ public bool InstallVxMusicAsSteamVrOverlay()
     public bool IsManifestEntryInAppConfig()
     {
         _logger.LogDebug("Checking if VXMusic is already added as a SteamVR Overlay..");
+
+        if (!SteamAppConfigPathExists)
+            return false;
+
         var (manifestPaths, _) = ReadContentsOfAppConfig();
         return SteamVrManifestPathExistsInAppConfig(manifestPaths, SteamAppConfigPath);
     }
@@ -62,7 +70,7 @@ private string GetSteamInstallationPath()
             _logger.LogError(ex.Message);
         }
 
-        return DefaultSteamAppConfigPath;
+        return "";
     }
 
     private bool AddManifestEntryToAppConfig(string vxMusicManifestFile)

diff --git a/VXMusicDesktop/MVVM/ViewModel/OverlayViewModel.cs b/VXMusicDesktop/MVVM/ViewModel/OverlayViewModel.cs
@@ -144,6 +144,12 @@ public void InstallVxMusicAsSteamVrOverlay(object commandParameter)
         {
             if (!IsManifestEntryAlreadyInAppConfig)
             {
+                if (!App.VXMusicSession.SteamVrOverlayApps.SteamInstallPathExists)
+                {
+                    MessageBox.Show("Steam is not installed!", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning);
+                    return;
+                }
+
                 if (App.VXMusicSession.SteamVrOverlayApps.InstallVxMusicAsSteamVrOverlay())
                 {
                     IsManifestEntryAlreadyInAppConfig = true;

diff --git a/VXMusicDesktop/VXMusicDesktop.csproj b/VXMusicDesktop/VXMusicDesktop.csproj
@@ -9,7 +9,7 @@
     <PackageIcon>VXLogo.png</PackageIcon>
     <ApplicationIcon>Images\VXLogoIcon.ico</ApplicationIcon>
     <RunPostBuildEvent>Always</RunPostBuildEvent>
-    <Version>0.6.5.1</Version>
+    <Version>0.6.5.2</Version>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <Title>VXMusicDesktop</Title>
     <Authors>VirtualXtensions</Authors>