# HG changeset patch
# User Matt Kimber <mattkimber@users.noreply.github.com>
# Date 2021-05-01 17:14:50
# Node ID f05752ac4669717d55b5c591285047c1492cfe54
# Parent  06f82554f1b811bb0dbc323af9c19e0e75018eb1

Fix 3d7ab09: stopped trains not updating viewport hash when reversed for a second time (#9165)

diff --git a/src/vehicle.cpp b/src/vehicle.cpp
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -1639,13 +1639,19 @@ void Vehicle::UpdateBoundingBoxCoordinat
  */
 void Vehicle::UpdateViewport(bool dirty)
 {
-	Rect old_coord = this->sprite_cache.old_coord;
+	/* If the existing cache is invalid we should ignore it, as it will be set to the current coords by UpdateBoundingBoxCoordinates */
+	bool ignore_cached_coords = this->sprite_cache.old_coord.left == INVALID_COORD;
 
 	this->UpdateBoundingBoxCoordinates(true);
-	UpdateVehicleViewportHash(this, this->coord.left, this->coord.top, old_coord.left, old_coord.top);
+
+	if (ignore_cached_coords) {
+		UpdateVehicleViewportHash(this, this->coord.left, this->coord.top, INVALID_COORD, INVALID_COORD);
+	} else {
+		UpdateVehicleViewportHash(this, this->coord.left, this->coord.top, this->sprite_cache.old_coord.left, this->sprite_cache.old_coord.top);
+	}
 
 	if (dirty) {
-		if (old_coord.left == INVALID_COORD) {
+		if (ignore_cached_coords) {
 			this->sprite_cache.is_viewport_candidate = this->MarkAllViewportsDirty();
 		} else {
 			this->sprite_cache.is_viewport_candidate = ::MarkAllViewportsDirty(