diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-08 12:38:21 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-08 12:38:21 +0200 |
| commit | 9cc12018928b73acccd575970a6e4dbcb5b460ac (patch) | |
| tree | a9ffaccca16aa71da94212e4810eee8fb15a1d19 /src/audio/MusicManager.cpp | |
| parent | lcs bridge (diff) | |
| parent | Merge pull request #1266 from Nick007J/miami (diff) | |
| download | re3-9cc12018928b73acccd575970a6e4dbcb5b460ac.tar re3-9cc12018928b73acccd575970a6e4dbcb5b460ac.tar.gz re3-9cc12018928b73acccd575970a6e4dbcb5b460ac.tar.bz2 re3-9cc12018928b73acccd575970a6e4dbcb5b460ac.tar.lz re3-9cc12018928b73acccd575970a6e4dbcb5b460ac.tar.xz re3-9cc12018928b73acccd575970a6e4dbcb5b460ac.tar.zst re3-9cc12018928b73acccd575970a6e4dbcb5b460ac.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/audio/MusicManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index 7033532c..74d86334 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -561,7 +561,7 @@ cMusicManager::ServiceGameMode() } } #ifdef RADIO_SCROLL_TO_PREV_STATION - else if(CPad::GetPad(0)->GetMouseWheelDownJustDown() || CPad::GetPad(0)->GetMouseWheelUpJustDown()) { + else if(!CPad::GetPad(0)->ArePlayerControlsDisabled() && (CPad::GetPad(0)->GetMouseWheelDownJustDown() || CPad::GetPad(0)->GetMouseWheelUpJustDown())) { if(!UsesPoliceRadio(vehicle) && !UsesTaxiRadio(vehicle)) { int scrollNext = ControlsManager.GetControllerKeyAssociatedWithAction(VEHICLE_CHANGE_RADIO_STATION, MOUSE); int scrollPrev = scrollNext == rsMOUSEWHEELUPBUTTON ? rsMOUSEWHEELDOWNBUTTON |