[Win] Fix returning default instead of Task leading to null reference exception

sttz · sttz · commit 75307d5e9a95 · 2022-09-05T21:14:27.000+02:00
diff --git a/sttz.InstallUnity/Installer/Platforms/WindowsPlatform.cs b/sttz.InstallUnity/Installer/Platforms/WindowsPlatform.cs
@@ -98,7 +98,8 @@ public Task<Installation> CompleteInstall(bool aborted, CancellationToken cancel
         if (!aborted)
         {
             var executable = Path.Combine(installationPaths, "Editor", "Unity.exe");
-            if (!File.Exists(executable)) return default;
+            if (!File.Exists(executable))
+                throw new Exception($"Unity exe not found at expected path after installation: {executable}");
 
             var installation = new Installation()
             {
@@ -113,7 +114,7 @@ public Task<Installation> CompleteInstall(bool aborted, CancellationToken cancel
         }
         else
         {
-            return default;
+            return Task.FromResult<Installation>(null);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,8 @@ public Task<Installation> CompleteInstall(bool aborted, CancellationToken cancel`
`98`	`98`	`if (!aborted)`
`99`	`99`	`{`
`100`	`100`	`var executable = Path.Combine(installationPaths, "Editor", "Unity.exe");`
`101`		`- if (!File.Exists(executable)) return default;`
	`101`	`+ if (!File.Exists(executable))`
	`102`	`+ throw new Exception($"Unity exe not found at expected path after installation: {executable}");`
`102`	`103`
`103`	`104`	`var installation = new Installation()`
`104`	`105`	`{`
`@@ -113,7 +114,7 @@ public Task<Installation> CompleteInstall(bool aborted, CancellationToken cancel`
`113`	`114`	`}`
`114`	`115`	`else`
`115`	`116`	`{`
`116`		`- return default;`
	`117`	`+ return Task.FromResult<Installation>(null);`
`117`	`118`	`}`
`118`	`119`	`}`
`119`	`120`