Make sure OnDeserialization() is called after Start()

JLChnToZ · Jan 30, 2024 · 40233a4 · 40233a4
1 parent e1b8233
commit 40233a4
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 1 deletion.
diff --git a/Packages/idv.jlchntoz.vvmw/Runtime/VVMW/FrontendHandler.asset b/Packages/idv.jlchntoz.vvmw/Runtime/VVMW/FrontendHandler.asset
@@ -44,7 +44,7 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 12
-      Data: 29
+      Data: 30
     - Name: 
       Entry: 7
       Data: 
@@ -1715,6 +1715,55 @@ MonoBehaviour:
     - Name: 
       Entry: 8
       Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: isInit
+    - Name: $v
+      Entry: 7
+      Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: isInit
+    - Name: <UserType>k__BackingField
+      Entry: 9
+      Data: 14
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 14
+    - Name: <SyncMode>k__BackingField
+      Entry: 7
+      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+    - Name: 
+      Entry: 6
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <IsSerialized>k__BackingField
+      Entry: 5
+      Data: false
+    - Name: _fieldAttributes
+      Entry: 7
+      Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
+        mscorlib
+    - Name: 
+      Entry: 12
+      Data: 0
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
     - Name: 
       Entry: 13
       Data: 

diff --git a/Packages/idv.jlchntoz.vvmw/Runtime/VVMW/FrontendHandler.cs b/Packages/idv.jlchntoz.vvmw/Runtime/VVMW/FrontendHandler.cs
@@ -51,6 +51,7 @@ public class FrontendHandler : UdonSharpEventSender {
         byte localFlags;
         int localPlayListIndex;
         ushort localPlayingIndex;
+        bool isInit;
 
         public VRCUrl[] QueueUrls {
             get {
@@ -183,6 +184,7 @@ void Start() {
                     UpdateState();
                 }
             }
+            isInit = true;
         }
 
         public void _AutoPlay() {
@@ -308,6 +310,10 @@ public override void OnPreSerialization() {
         }
 
         public override void OnDeserialization() {
+            if (!isInit) {
+                SendCustomEventDelayedFrames("_onDeserialization", 0);
+                return;
+            }
             if (!synced) return;
             localQueuedUrls = queuedUrls;
             localQueuedPlayerIndex = queuedPlayerIndex;