Merge pull request #23 from o-tr/master

v0.2.19をリリース
o-tr · Nov 29, 2024 · 3618f55 · 3618f55
2 parents 26b2485 + f7ab72b
commit 3618f55
Show file tree

Hide file tree

Showing 5 changed files with 355 additions and 407 deletions.
diff --git a/Assets/Textures/SplashScreen/ImageSlide.png b/Assets/Textures/SplashScreen/ImageSlide.png
diff --git a/Assets/Textures/SplashScreen/ImageSlideViewer.png b/Assets/Textures/SplashScreen/ImageSlideViewer.png
diff --git a/Runtime/jp.ootr.ImageSlide/Scripts/22_LogicQueue.cs b/Runtime/jp.ootr.ImageSlide/Scripts/22_LogicQueue.cs
@@ -41,7 +41,6 @@ public string[][] FileNames
         }
 
         private bool _isInitialized;
-        private bool _isSyncAllPending;
 
         public string[] GetSources()
         {
@@ -395,21 +394,20 @@ public void OnSyncAllRequested()
 
         private void RequestSyncAll()
         {
-            if (_isSyncAllPending)
-            {
-                ConsoleDebug("skip request sync all because already pending", _logicQueuePrefix);
-                return;
-            }
             var dic = new DataDictionary();
             dic.SetValue("type", (int)QueueType.RequestSyncAll);
             if (!VRCJson.TrySerializeToJson(dic, JsonExportType.Minify, out var json))
             {
                 ConsoleError($"failed to serialize request sync all json: {json}", _logicQueuePrefix);
                 return;
             }
+            if (_queue.Has(json.String))
+            {
+                ConsoleDebug("skip request sync all because already pending", _logicQueuePrefix);
+                return;
+            }
 
             AddQueue(json.String);
-            _isSyncAllPending = true;
             if (_isProcessing) return;
             _isProcessing = true;
             ProcessQueue();
@@ -437,7 +435,6 @@ private void DoSyncAll()
             }
 
             AddSyncQueue(json.String);
-            _isSyncAllPending = false;
             ProcessQueue();
         }