mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-12 08:49:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

Solve ANRs due to resuming music player which is in an unplayable state

Browse Source
This commit is contained in:
yairm210
2024-10-15 14:54:02 +03:00
parent d26d942f58
commit afbc15db79
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/ui/audio/MusicController.kt
View File

@ -544,7 +544,8 @@ class MusicController {
*/ */
fun resume(speedFactor: Float = 1f) { fun resume(speedFactor: Float = 1f) {
Log.debug("MusicTrackController.resume called") Log.debug("MusicTrackController.resume called")
if (state == ControllerState.Pause && current != null) { if (state == ControllerState.Pause && current != null
&& current!!.state.canPlay && current!!.music != null) {
val fadingStep = defaultFadingStep * speedFactor.coerceIn(0.001f..1000f) val fadingStep = defaultFadingStep * speedFactor.coerceIn(0.001f..1000f)
current!!.startFade(MusicTrackController.State.FadeIn, fadingStep) current!!.startFade(MusicTrackController.State.FadeIn, fadingStep)
// this may circumvent a PlaySingle, but - // this may circumvent a PlaySingle, but -