fixes ESD-ISO bug when combining Pro and Core in the correct way

gus33000 · Mar 6, 2016 · 5c6b32b · 5c6b32b
1 parent 3937601
commit 5c6b32b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bin/esd_lib.ps1 b/bin/esd_lib.ps1
@@ -645,7 +645,7 @@ function Get-InfosFromESD (
 
 	if ($esdinformations.count -eq 1) {
 		$DVDLabel = $esdinformations[0].VolumeLabel
-	} elseif ($esdinformations.count -eq 2 -and $esdinformations[0].Editions -eq "Core" -and $esdinformations[1].Editions -eq "Professional" -and $parts -eq 1) {
+	} elseif ($esdinformations.count -eq 2 -and $esdinformations[0].Editions -eq "Professional" -and $esdinformations[1].Editions -eq "Core" -and $parts -eq 1) {
 		$DVDLabel = ($tag+'_CCSA_'+$arch+$ltag+$esdinformations[0].LanguageCode+'_'+$DVD).ToUpper()
 	} else {
 		$DVDLabel = "ESD-ISO"

diff --git a/bin/main.ps1 b/bin/main.ps1
@@ -616,7 +616,7 @@ function global:Get-InfosFromESD (
 
 	if ($esdinformations.count -eq 1) {
 		$DVDLabel = $esdinformations[0].VolumeLabel
-	} elseif ($esdinformations.count -eq 2 -and $esdinformations[0].Editions -eq "Core" -and $esdinformations[1].Editions -eq "Professional" -and $parts -eq 1) {
+	} elseif ($esdinformations.count -eq 2 -and $esdinformations[0].Editions -eq "Professional" -and $esdinformations[1].Editions -eq "Core" -and $parts -eq 1) {
 		$DVDLabel = ($tag+'_CCSA_'+$arch+$ltag+$esdinformations[0].LanguageCode+'_'+$DVD).ToUpper()
 	} else {
 		$DVDLabel = "ESD-ISO"