# HG changeset patch # User Michael Pavone # Date 1525244148 25200 # Node ID ea7d5ced2415fd2047d98d8767c80a5db3b1342b # Parent f66290afae655e230b4f53eae6afc39880ecf913 Fix deadlock when changing settings before loading first ROM diff -r f66290afae65 -r ea7d5ced2415 render_sdl.c --- a/render_sdl.c Tue May 01 20:19:31 2018 -0700 +++ b/render_sdl.c Tue May 01 23:55:48 2018 -0700 @@ -1158,8 +1158,13 @@ } #endif - SDL_CloseAudio(); + uint8_t was_paused = SDL_GetAudioStatus() == SDL_AUDIO_PAUSED; + render_close_audio(); + quitting = 0; init_audio(); + if (!was_paused) { + SDL_PauseAudio(0); + } double lowpass_cutoff = get_lowpass_cutoff(config); double rc = (1.0 / lowpass_cutoff) / (2.0 * M_PI);