From 0f518bf57ddba0eeccf0f355210601954a1dc879 Mon Sep 17 00:00:00 2001
From: Nathan Sweet <nathan.sweet@gmail.com>
Date: Fri, 26 Feb 2021 11:24:50 +0100
Subject: [PATCH] Fixed Skeleton Viewer NPE on load.

---
 .../src/com/esotericsoftware/spine/SkeletonViewer.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java
index 6e020fee1..95b942269 100644
--- a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java
+++ b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java
@@ -118,6 +118,7 @@ public class SkeletonViewer extends ApplicationAdapter {
 
 	void loadSkeleton (final @Null FileHandle skeletonFile) {
 		if (skeletonFile == null) return;
+		this.skeletonFile = skeletonFile;
 
 		try {
 			atlas = new SkeletonViewAtlas(this, skeletonFile);
@@ -137,6 +138,7 @@ public class SkeletonViewer extends ApplicationAdapter {
 			ex.printStackTrace();
 			ui.toast("Error loading skeleton: " + skeletonFile.name());
 			lastModifiedCheck = 5;
+			this.skeletonFile = null;
 			return;
 		}
 
@@ -154,7 +156,6 @@ public class SkeletonViewer extends ApplicationAdapter {
 			}
 		});
 
-		this.skeletonFile = skeletonFile;
 		skeletonModified = skeletonFile.lastModified();
 		atlasModified = atlas.lastModified();
 		lastModifiedCheck = checkModifiedInterval;