From: Marcel van der Veldt Date: Sun, 27 Sep 2020 18:01:43 +0000 (+0200) Subject: only terminate sox if its runing X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=66fec8f15d00dc2104db47e9ee83f68f8e76b85d;p=music-assistant-server.git only terminate sox if its runing --- diff --git a/music_assistant/stream_manager.py b/music_assistant/stream_manager.py index 4b28477d..8dbe4c46 100755 --- a/music_assistant/stream_manager.py +++ b/music_assistant/stream_manager.py @@ -147,8 +147,8 @@ class StreamManager: if fill_buffer_task and not fill_buffer_task.cancelled(): fill_buffer_task.cancel() await sox_proc.communicate() - sox_proc.terminate() if sox_proc and sox_proc.returncode is None: + sox_proc.terminate() await sox_proc.wait() else: LOGGER.debug( @@ -204,8 +204,8 @@ class StreamManager: if fill_buffer_task and not fill_buffer_task.cancelled(): fill_buffer_task.cancel() await sox_proc.communicate() - sox_proc.terminate() if sox_proc and sox_proc.returncode is None: + sox_proc.terminate() await sox_proc.wait() else: LOGGER.debug( @@ -471,8 +471,8 @@ class StreamManager: ) # read remaining bytes await process.communicate() - process.terminate() if process and process.returncode is None: + process.terminate() await process.wait() # signal end of stream event