Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-12 21:45:06 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix cancel bug

Browse Source
This commit is contained in:
Masataka SUMI 2022-02-09 23:17:32 +09:00
parent 09ef2b93fc
commit 6421ffb426
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs
View File

@ -432,6 +432,7 @@ namespace UniVRM10.VRM10Viewer
_cancellationTokenSource?.Dispose();
_cancellationTokenSource = new CancellationTokenSource();
var cancellationToken = _cancellationTokenSource.Token;
try
{
@ -443,10 +444,10 @@ namespace UniVRM10.VRM10Viewer
awaitCaller: new RuntimeOnlyAwaitCaller(),
materialGenerator: GetVrmMaterialDescriptorGenerator(m_useUrpMaterial.isOn),
vrmMetaInformationCallback: m_texts.UpdateMeta,
ct: _cancellationTokenSource.Token);
ct: cancellationToken);
if (vrm10Instance != null)
{
if (_cancellationTokenSource.Token.IsCancellationRequested)
if (cancellationToken.IsCancellationRequested)
{
UnityObjectDestoyer.DestroyRuntimeOrEditor(vrm10Instance.gameObject);
return;
@ -464,7 +465,7 @@ namespace UniVRM10.VRM10Viewer
throw new Exception("Failed to load the file as glTF format.");
}
if (_cancellationTokenSource.Token.IsCancellationRequested)
if (cancellationToken.IsCancellationRequested)
{
gltfModel.Dispose();
return;