2 files changed, 14 insertions, 0 deletions
diff --git a/fifteen.c b/fifteen.c
index b3285e7..338bdfb 100644
--- a/fifteen.c
+++ b/fifteen.c
@@ -554,6 +554,13 @@ void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
     {
 	char statusbuf[256];
 
+        /*
+         * Don't show the new status until we're also showing the
+         * new _state_ - after the game animation is complete.
+         */
+        if (oldstate)
+            state = oldstate;
+
 	sprintf(statusbuf, "%sMoves: %d",
 		(state->completed ? "COMPLETED! " : ""),
 		(state->completed ? state->completed : state->movecount));
diff --git a/sixteen.c b/sixteen.c
index 89eef4f..3ea115c 100644
--- a/sixteen.c
+++ b/sixteen.c
@@ -599,6 +599,13 @@ void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
     {
 	char statusbuf[256];
 
+        /*
+         * Don't show the new status until we're also showing the
+         * new _state_ - after the game animation is complete.
+         */
+        if (oldstate)
+            state = oldstate;
+
 	sprintf(statusbuf, "%sMoves: %d",
 		(state->completed ? "COMPLETED! " : ""),
 		(state->completed ? state->completed : state->movecount));