SkeletonViewer, don't show "Reloaded" if the loading failed.

EsotericSoftware · Sep 13, 2021 · afa9a87 · afa9a87
1 parent dc9a6eb
commit afa9a87
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java
@@ -237,10 +237,7 @@ public void render () {
 				}
 			} else {
 				reloadTimer -= delta;
-				if (reloadTimer <= 0) {
-					loadSkeleton(skeletonFile);
-					ui.toast("Reloaded.");
-				}
+				if (reloadTimer <= 0 && loadSkeleton(skeletonFile)) ui.toast("Reloaded.");
 			}
 
 			// Pose and render skeleton.

diff --git a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewerUI.java b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewerUI.java
@@ -374,19 +374,15 @@ public void clicked (InputEvent event, float x, float y) {
 		loadScaleSlider.addListener(new ChangeListener() {
 			public void changed (ChangeEvent event, Actor actor) {
 				loadScaleLabel.setText(Integer.toString((int)(loadScaleSlider.getValue() * 100)) + "%");
-				if (!loadScaleSlider.isDragging()) {
-					viewer.loadSkeleton(viewer.skeletonFile);
-					toast("Reloaded.");
-				}
+				if (!loadScaleSlider.isDragging() && viewer.loadSkeleton(viewer.skeletonFile)) toast("Reloaded.");
 				loadScaleResetButton.setText(loadScaleSlider.getValue() == 1 ? "Reload" : "Reset");
 			}
 		});
 		loadScaleResetButton.addListener(new ChangeListener() {
 			public void changed (ChangeEvent event, Actor actor) {
 				viewer.resetCameraPosition();
 				if (loadScaleSlider.getValue() == 1) {
-					viewer.loadSkeleton(viewer.skeletonFile);
-					toast("Reloaded.");
+					if (viewer.loadSkeleton(viewer.skeletonFile)) toast("Reloaded.");
 				} else
 					loadScaleSlider.setValue(1);
 				loadScaleResetButton.setText("Reload");