From 76c8a856febf6c5e84505d241bbdbf729a1281d3 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Mon, 29 Apr 2024 20:56:28 +0200 Subject: [PATCH] AnimationEditor - Fix null reference exception when loading treeview --- PCK-Studio/Extensions/AnimationExtensions.cs | 4 ++++ PCK-Studio/Forms/Editor/AnimationEditor.cs | 2 ++ 2 files changed, 6 insertions(+) diff --git a/PCK-Studio/Extensions/AnimationExtensions.cs b/PCK-Studio/Extensions/AnimationExtensions.cs index 557e8e45..9c6e2b8d 100644 --- a/PCK-Studio/Extensions/AnimationExtensions.cs +++ b/PCK-Studio/Extensions/AnimationExtensions.cs @@ -15,6 +15,10 @@ namespace PckStudio.Extensions { internal static Image CreateAnimationImage(this Animation animation) { + if (animation.FrameCount == 0) + { + return null; + } var ms = new System.IO.MemoryStream(); var generateor = new AnimatedGifCreator(ms, Animation.GameTickInMilliseconds, 0); foreach (var frame in animation.GetInterpolatedFrames()) diff --git a/PCK-Studio/Forms/Editor/AnimationEditor.cs b/PCK-Studio/Forms/Editor/AnimationEditor.cs index f96da2bd..da56968e 100644 --- a/PCK-Studio/Forms/Editor/AnimationEditor.cs +++ b/PCK-Studio/Forms/Editor/AnimationEditor.cs @@ -94,6 +94,8 @@ namespace PckStudio.Forms.Editor TextureIcons.Images.AddRange(_animation.GetTextures().ToArray()); UpdateTreeView(); + animationPictureBox.Image ??= _animation.CreateAnimationImage(); + if (_animation.FrameCount > 0) { animationPictureBox.Image.SelectActiveFrame(FrameDimension.Page, 0);