Skip to content

Commit fe538f9

Browse files
committed
Fixes for selection of missing unity versions
1 parent cf4e58b commit fe538f9

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

UnitySetup/UnitySetup.psm1

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ function Select-UnitySetupInstance
395395
}
396396
}
397397
}
398-
else { $Instances }
398+
elseif( $Instances.Count -gt 0 ) { $Instances }
399399
}
400400
end
401401
{
@@ -548,7 +548,7 @@ function Start-UnityEditor
548548
else
549549
{
550550
$setupInstance = Get-UnitySetupInstance | Select-UnitySetupInstance -Latest
551-
if($null -ne $setupInstance)
551+
if($setupInstance.Count -gt 0)
552552
{
553553
$setupInstances += ,$setupInstance
554554
}
@@ -576,7 +576,7 @@ function Start-UnityEditor
576576
elseif( $Latest )
577577
{
578578
$setupInstance = Get-UnitySetupInstance | Select-UnitySetupInstance -Latest
579-
if($null -ne $setupInstance)
579+
if($setupInstance.Count -gt 0)
580580
{
581581
$setupInstances = ,$setupInstance
582582
}
@@ -594,7 +594,7 @@ function Start-UnityEditor
594594
elseif($null -ne $Version)
595595
{
596596
$setupInstance = Get-UnitySetupInstance | Select-UnitySetupInstance -Version $Version
597-
if($null -ne $setupInstance)
597+
if($setupInstance.Count -gt 0)
598598
{
599599
$setupInstances = ,$setupInstance
600600
}
@@ -612,26 +612,25 @@ function Start-UnityEditor
612612

613613
$instanceArgs = @()
614614
foreach( $p in $projectInstances ) {
615-
$projectVersion = $p.Version
616615

617616
if( $Latest ) {
618617
$setupInstance = Get-UnitySetupInstance | Select-UnitySetupInstance -Latest
619-
if($null -eq $setupInstance) {
618+
if($setupInstance.Count -eq 0) {
620619
Write-Error "Could not find any Unity Editor installed"
621620
continue
622621
}
623622
}
624623
elseif($null -ne $Version) {
625624
$setupInstance = Get-UnitySetupInstance | Select-UnitySetupInstance -Version $Version
626-
if ($null -eq $setupInstance) {
625+
if ($setupInstance.Count -eq 0) {
627626
Write-Error "Could not find Unity Editor for version $Version"
628627
continue
629628
}
630629
}
631630
else {
632-
$setupInstance = Get-UnitySetupInstance | Select-UnitySetupInstance -Version $projectVersion
633-
if($null -eq $setupInstance) {
634-
Write-Error "Could not find Unity Editor for version $projectVersion"
631+
$setupInstance = Get-UnitySetupInstance | Select-UnitySetupInstance -Version $p.Version
632+
if($setupInstance.Count -eq 0) {
633+
Write-Error "Could not find Unity Editor for version $($p.Version)"
635634
continue
636635
}
637636
}

0 commit comments

Comments
 (0)