Added alternative method of finding Rocksmith Folder

Jamedjo · May 4, 2014 · 85d9c80 · 85d9c80
1 parent 363a4de
commit 85d9c80
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/RockSmithTabExplorer/Services/RocksmithLocator.cs b/RockSmithTabExplorer/Services/RocksmithLocator.cs
@@ -42,6 +42,12 @@ public static List<string> LibraryFolders()
             return folders;
         }
 
+        public static string Rocksmith2014FolderFromUbisoftKey()
+        {
+            RegistryKey ubiKey = Registry.LocalMachine.OpenSubKey(@"Software\Ubisoft\Rocksmith2014") ?? Registry.LocalMachine.OpenSubKey(@"Software\Wow6432Node\Ubisoft\Rocksmith2014");
+            return ubiKey.GetValue("installdir").ToString();
+        }
+
         public static string Rocksmith2014Folder()
         {
             var appFolders = LibraryFolders().Select(x => x + "\\SteamApps\\common");
@@ -61,7 +67,9 @@ public static string Rocksmith2014Folder()
                 }
 
             }
-            return null;
+
+            // Couldn't find folder, attempt another method
+            return Rocksmith2014FolderFromUbisoftKey();
         }
     }
 }
diff --git a/RockSmithTabExplorerTests/RockSmithLocatorTests.cs b/RockSmithTabExplorerTests/RockSmithLocatorTests.cs
@@ -85,5 +85,11 @@ public void ItFindsRocksmith2014Folder()
         {
             StringAssert.Matches(RocksmithLocator.Rocksmith2014Folder(), new Regex("Rocksmith2014"));
         }
+
+        [TestMethod]
+        public void ItFindsRocksmith2014FolderFromUbisoftKey()
+        {
+            StringAssert.Matches(RocksmithLocator.Rocksmith2014FolderFromUbisoftKey(), new Regex("Rocksmith2014"));
+        }
     }
 }