From afa9a873adde9d1b995c4617706186a8b9c991d3 Mon Sep 17 00:00:00 2001 From: Nathan Sweet Date: Sun, 12 Sep 2021 18:15:35 -0600 Subject: [PATCH] SkeletonViewer, don't show "Reloaded" if the loading failed. --- .../src/com/esotericsoftware/spine/SkeletonViewer.java | 5 +---- .../src/com/esotericsoftware/spine/SkeletonViewerUI.java | 8 ++------ 2 files changed, 3 insertions(+), 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 index 7a3c0ba13f..30d436903c 100644 --- 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 index a97f0808ff..37f2c0a496 100644 --- a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewerUI.java +++ b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewerUI.java @@ -374,10 +374,7 @@ 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"); } }); @@ -385,8 +382,7 @@ public void changed (ChangeEvent event, Actor actor) { 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");