diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-06-30 21:46:08 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-06-30 21:46:08 +0300 |
| commit | dd790b00e511b4a15c7d09fe1393fb77b0983280 (patch) | |
| tree | 9e903dcba7aa0fc14e906bbd4860b07c40b96457 | |
| parent | 138abb91f6232ef40e1093b3c37122e1b0bf2cf1 (diff) | |
| parent | cb72fee9410c4cd41bcd35abd17428f2b864e599 (diff) | |
Merge branch 'miami' into lcs
# Conflicts:
# src/audio/MusicManager.cpp
| -rw-r--r-- | src/audio/MusicManager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index 9032a8e7..855de1d0 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -315,8 +315,10 @@ cMusicManager::ChangeMusicMode(uint8 mode) #ifdef PAUSE_RADIO_IN_FRONTEND // rewind those streams we weren't listening right now - for( uint32 i = STREAMED_SOUND_RADIO_HEAD; i < STREAMED_SOUND_CUTSCENE_BIKER; i++ ) + for( uint32 i = STREAMED_SOUND_RADIO_HEAD; i < STREAMED_SOUND_CUTSCENE_BIKER; i++ ) { m_aTracks[i].m_nPosition = GetTrackStartPos(i); + m_aTracks[i].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode(); + } #endif break; |