MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-06 14:46:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Try fix crash when canceling download

Browse Source
This commit is contained in:
Natsumi
2021-05-29 21:11:06 +12:00
parent 36281bb4ad
commit 11376bbdf7
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AssetBundleCacher.cs
+13 -6
View File
@@ -159,17 +159,24 @@ namespace VRCX
public void CancelDownload() public void CancelDownload()
{ {
DownloadCanceled = true; DownloadCanceled = true;
if (client != null) try
{ {
client.CancelAsync(); if (client != null)
{
client.CancelAsync();
} }
if (process != null && !process.HasExited) if (process != null && !process.HasExited)
{ {
process.Kill(); process.Kill();
if (File.Exists(DownloadTempLocation)) if (File.Exists(DownloadTempLocation))
File.Delete(DownloadTempLocation); File.Delete(DownloadTempLocation);
if (Directory.Exists(Path.Combine(AssetBundleCacherTemp, AssetId))) if (Directory.Exists(Path.Combine(AssetBundleCacherTemp, AssetId)))
Directory.Delete(Path.Combine(AssetBundleCacherTemp, AssetId), true); Directory.Delete(Path.Combine(AssetBundleCacherTemp, AssetId), true);
}
}
catch(Exception)
{
} }
DownloadProgress = -4; DownloadProgress = -4;
} }
@@ -256,7 +263,7 @@ namespace VRCX
Directory.Delete(Path.Combine(AssetBundleCacherTemp, AssetId), true); Directory.Delete(Path.Combine(AssetBundleCacherTemp, AssetId), true);
File.Delete(DownloadTempLocation); File.Delete(DownloadTempLocation);
} }
catch catch(Exception)
{ {
DownloadProgress = -14; DownloadProgress = -14;
return; return;