From d31e92e652965c84df4939adb2554edf11496a95 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sun, 24 Feb 2019 15:49:03 +0000 Subject: [PATCH] Fix #8742: access violation in vehicle_update_sound_params --- distribution/changelog.txt | 1 + src/openrct2/ride/Vehicle.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 17f1b84dcc..32405b5ff1 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -71,6 +71,7 @@ - Fix: [#8647] Marketing campaigns check for entry fees below £1 (original bug). - Fix: [#8653] Crash when peeps attempt to enter a ride with no vehicles. - Fix: [#8720] Desync due to boats colliding with ghost pieces. +- Fix: [#8742] Access violation in vehicle_update_sound_params. - Improved: [#2940] Allow mouse-dragging to set patrol area (Singleplayer only). - Improved: [#7730] Draw extreme vertical and lateral Gs red in the ride window's graph tab. - Improved: [#7930] Automatically create folders for custom content. diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 06d320f9cc..31f5f78468 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -879,6 +879,9 @@ static void vehicle_update_sound_params(rct_vehicle* vehicle) if (vehicle->sprite_left == LOCATION_NULL) return; + if (g_music_tracking_viewport == nullptr) + return; + int16_t left = g_music_tracking_viewport->view_x; int16_t bottom = g_music_tracking_viewport->view_y; int16_t quarter_w = g_music_tracking_viewport->view_width / 4;