patch 8.1.1851: crash when sound_playfile() callback plays soundv8.1.1851

Problem:    Crash when sound_playfile() callback plays sound.
Solution:   Invoke callback later from event loop.

1 files changed, 15 insertions, 5 deletions

diff --git a/src/ui.c b/src/ui.c
index c8cedb955..1b1b2cd64 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -459,12 +459,22 @@ ui_wait_for_chars_or_timer(
 	}
 	if (due_time <= 0 || (wtime > 0 && due_time > remaining))
 	    due_time = remaining;
-# ifdef FEAT_JOB_CHANNEL
-	if ((due_time < 0 || due_time > 10L)
-#  ifdef FEAT_GUI
-		&& !gui.in_use
+# if defined(FEAT_JOB_CHANNEL) || defined(FEAT_SOUND_CANBERRA)
+	if ((due_time < 0 || due_time > 10L) && (
+#  if defined(FEAT_JOB_CHANNEL)
+		(
+#   if defined(FEAT_GUI)
+		!gui.in_use &&
+#   endif
+		(has_pending_job() || channel_any_readahead()))
+#   ifdef FEAT_SOUND_CANBERRA
+		||
+#   endif
+#  endif
+#  ifdef FEAT_SOUND_CANBERRA
+		    has_any_sound_callback()
 #  endif
-		&& (has_pending_job() || channel_any_readahead()))
+		    ))
 	{
 	    // There is a pending job or channel, should return soon in order
 	    // to handle them ASAP.  Do check for input briefly.