Fix #5787: Opening an incomplete ride moves the viewport to unrelated…

… place Remove ghost elements for track before validating it.
OpenRCT2 · Jul 4, 2017 · 705ad7c · 705ad7c
1 parent a558423
commit 705ad7c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/distribution/changelog.txt b/distribution/changelog.txt
@@ -118,6 +118,7 @@
 - Fix: [#5096] Failure to open parks with out of bounds sprite coordinates.
 - Fix: [#5114] Some entertainer costumes never select-able.
 - Fix: [#5381] Game crashes in scenario editor when scenery or pathing is clicked on when no objects loaded.
+- Fix: [#5787] Opening an incomplete ride moves the viewport to unrelated place.
 
 0.0.5 (2016-12-27)
 ------------------------------------------------------------------------

diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c
@@ -5541,6 +5541,10 @@ void game_command_set_ride_status(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32
             if (constructionWindow != NULL) {
                 window_close(constructionWindow);
             }
+        } else {
+            // #5787: We need to make sure ghost elements are removed before validating
+            //        the track.
+            ride_construction_remove_ghosts();
         }
 
         if (targetStatus == RIDE_STATUS_TESTING) {