From c734e5b5daafc98350a289303ca88e54d6235480 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 10 Mar 2020 18:14:35 +1100
Subject: [PATCH] musicinjector: use cdpath/hdpath to try finding jukebox.si

---
 Rebuilder/MusicInjector.cs | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/Rebuilder/MusicInjector.cs b/Rebuilder/MusicInjector.cs
index c396973..d4c2e81 100644
--- a/Rebuilder/MusicInjector.cs
+++ b/Rebuilder/MusicInjector.cs
@@ -108,6 +108,27 @@ namespace Rebuilder
 
             test_dirs.AddRange(Rebuilder.standard_hdd_dirs);
 
+            // Check registry for CD path
+            using (RegistryKey reg = Rebuilder.GetGameRegistryKey())
+            {
+                if (reg != null)
+                {
+                    string p = reg.GetValue("cdpath").ToString();
+
+                    if (!string.IsNullOrEmpty(p))
+                    {
+                        test_dirs.Add(p);
+                    }
+
+                    p = reg.GetValue("hdpath").ToString();
+
+                    if (!string.IsNullOrEmpty(p))
+                    {
+                        test_dirs.Add(p);
+                    }
+                }
+            }
+
             // Loop through drive letters
             for (int i=65;i<91;i++)
             {
@@ -115,7 +136,7 @@ namespace Rebuilder
                 test_dirs.Add(drive_letter);
             }
 
-            for (int i=0;i< test_dirs.Count;i++)
+            for (int i=0;i<test_dirs.Count;i++)
             {
                 string test_fn = test_dirs[i] + "/LEGO/Scripts/ISLE/JUKEBOX.SI";
                 if (File.Exists(test_fn))