Merge branch 'dev' into main

VolcanicArts · Sep 28, 2023 · f85d981 · f85d981
2 parents 0ade081 + 193753d
commit f85d981
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/VRCOSC.Desktop/VRCOSC.Desktop.csproj b/VRCOSC.Desktop/VRCOSC.Desktop.csproj
@@ -6,12 +6,12 @@
     <ApplicationIcon>game.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Version>0.0.0</Version>
-    <FileVersion>2023.928.0</FileVersion>
+    <FileVersion>2023.928.1</FileVersion>
     <Title>VRCOSC</Title>
     <Authors>VolcanicArts</Authors>
     <Company>VolcanicArts</Company>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>2023.928.0</AssemblyVersion>
+    <AssemblyVersion>2023.928.1</AssemblyVersion>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\VRCOSC.Game\VRCOSC.Game.csproj" />

diff --git a/VRCOSC.Game/Graphics/ChatBox/Timeline/Menu/Layer/TimelineLayerMenu.cs b/VRCOSC.Game/Graphics/ChatBox/Timeline/Menu/Layer/TimelineLayerMenu.cs
@@ -46,6 +46,7 @@ private void createClip()
         clip.End.Value = upperBound;
         clip.Priority.Value = Layer.Priority;
 
+        clip.Load();
         appManager.ChatBoxManager.Clips.Add(clip);
 
         Hide();