Merge pull request #54 from beat-saber-modding-group/oculus-path-dete…

…ct-fix Fix Oculus path detect Linq error
bsmg · May 12, 2019 · ec1f44e · ec1f44e
2 parents 5c49927 + 82352b5
commit ec1f44e
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/BeatSaberModManager/Core/PathLogic.cs b/BeatSaberModManager/Core/PathLogic.cs
@@ -145,13 +145,19 @@ private string GetValidOculusLocation()
                     {
                         using (RegistryKey libraryKey = librariesKey.OpenSubKey(libraryKeyName))
                         {
-                            string libraryPath = (string) libraryKey.GetValue("Path");
-                            folderPath = Path.Combine(guidLetterVolumes.First(x => libraryPath.Contains(x.Key)).Value, libraryPath.Substring(49), subFolderPath);
-                            fullAppPath = Path.Combine(folderPath, AppFileName);
+                            string libraryPath = (string)libraryKey.GetValue("Path");
 
-                            if (File.Exists(fullAppPath))
+                            // Apparently this can be null
+                            var guidLetter = guidLetterVolumes.FirstOrDefault(x => libraryPath.Contains(x.Key)).Value;
+                            if (guidLetter != null)
                             {
-                                return folderPath;
+                                folderPath = Path.Combine(guidLetter, libraryPath.Substring(49), subFolderPath);
+                                fullAppPath = Path.Combine(folderPath, AppFileName);
+
+                                if (File.Exists(fullAppPath))
+                                {
+                                    return folderPath;
+                                }
                             }
                         }
                     }