From 5cf79f66fe57f3f80a74a67a1008188ae57f721b Mon Sep 17 00:00:00 2001 From: hiker Date: Thu, 10 Jan 2019 23:11:25 +1100 Subject: [PATCH] Revert "Fix #3697", since this was not included in any of the binaries built. It is already on master. This reverts commit eecfc5d7973e533eb7cfb3188266d8171bf99ae8. --- src/tracks/track.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp index 661466a36..b4d54e07d 100644 --- a/src/tracks/track.cpp +++ b/src/tracks/track.cpp @@ -550,6 +550,7 @@ void Track::loadTrackInfo() root->get("version", &m_version); std::vector filenames; root->get("music", &filenames); + getMusicInformation(filenames, m_music); root->get("screenshot", &m_screenshot); root->get("gravity", &m_gravity); root->get("friction", &m_friction); @@ -572,7 +573,6 @@ void Track::loadTrackInfo() root->get("color-level-in", &m_color_inlevel); root->get("color-level-out", &m_color_outlevel); - getMusicInformation(filenames, m_music); if (m_default_number_of_laps <= 0) m_default_number_of_laps = 3; m_actual_number_of_laps = m_default_number_of_laps; @@ -702,7 +702,7 @@ void Track::getMusicInformation(std::vector& filenames, } // for i in filenames - if (m_music.empty() && !isInternal() && !m_is_cutscene) + if (m_music.empty()) { m_music.push_back(stk_config->m_default_music);