Fix an issue preventing the conversion of older builds (< 17134)

gus33000 · Feb 18, 2021 · 0ceb9c8 · 0ceb9c8
1 parent bfd94b1
commit 0ceb9c8
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/src/MediaCreationLib.NET/BootlegEditions/BootlegEditionCreator.cs b/src/MediaCreationLib.NET/BootlegEditions/BootlegEditionCreator.cs
@@ -361,18 +361,25 @@ void ProgressCallback(int percent, string file)
                 }
                 else
                 {
-                    string lpfilter2 = $"microsoft-windows-client-languagepack-package_{languagecode}-*-{languagecode}.esd";
                     string lppackage = "";
-                    if (Directory.EnumerateFiles(UUPPath, lpfilter2, SearchOption.AllDirectories).Count() > 0)
-                    {
-                        lppackage = Directory.EnumerateFiles(UUPPath, lpfilter2, SearchOption.AllDirectories).First();
-                    }
-                    else
+
+                    string lpfilter2 = $"*fre_client_{languagecode}_lp.esd";
+                    if (Directory.EnumerateFiles(UUPPath, lpfilter2, SearchOption.AllDirectories).Count() <= 0)
                     {
-                        lpfilter2 = $"microsoft-windows-client-languagepack-package_{languagecode}~*~{languagecode}~.esd";
-                        lppackage = Directory.EnumerateFiles(UUPPath, lpfilter2, SearchOption.AllDirectories).First();
+                        lpfilter2 = $"microsoft-windows-client-languagepack-package_{languagecode}-*-{languagecode}.esd";
+                        if (Directory.EnumerateFiles(UUPPath, lpfilter2, SearchOption.AllDirectories).Count() <= 0)
+                        {
+                            lpfilter2 = $"microsoft-windows-client-languagepack-package_{languagecode}~*~{languagecode}~.esd";
+                            if (Directory.EnumerateFiles(UUPPath, lpfilter2, SearchOption.AllDirectories).Count() <= 0)
+                            {
+                                progressCallback?.Invoke(Common.ProcessPhase.Error, true, 0, "Unable to find LP package!");
+                                goto exit;
+                            }
+                        }
                     }
 
+                    lppackage = Directory.EnumerateFiles(UUPPath, lpfilter2, SearchOption.AllDirectories).First();
+
                     result = imagingInterface.ApplyImage(lppackage, 1, LPFolder, PreserveACL: false, progressCallback: callback2);
                     if (!result)
                         goto exit;