From f0713b96f5e9b3adbd3a72488b97e62efd5481e2 Mon Sep 17 00:00:00 2001
From: 0xb00bface <0xboobface@gmail.com>
Date: Sun, 30 Aug 2020 13:41:43 +0200
Subject: [PATCH] Try to terminate FFmpeg before killing it

---
 .../recorder/download/hls/MergedFfmpegHlsDownload.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/ctbrec/recorder/download/hls/MergedFfmpegHlsDownload.java b/common/src/main/java/ctbrec/recorder/download/hls/MergedFfmpegHlsDownload.java
index 2721efb6..f6a92328 100644
--- a/common/src/main/java/ctbrec/recorder/download/hls/MergedFfmpegHlsDownload.java
+++ b/common/src/main/java/ctbrec/recorder/download/hls/MergedFfmpegHlsDownload.java
@@ -412,9 +412,12 @@ public class MergedFfmpegHlsDownload extends AbstractHlsDownload {
             try {
                 boolean waitFor = ffmpeg.waitFor(45, TimeUnit.SECONDS);
                 if (!waitFor && ffmpeg.isAlive()) {
-                    LOG.info("FFmpeg didn't terminate. Destroying the process with force!");
-                    ffmpeg.destroyForcibly();
-                    ffmpeg = null;
+                    ffmpeg.destroy();
+                    if (ffmpeg.isAlive()) {
+                        LOG.info("FFmpeg didn't terminate. Destroying the process with force!");
+                        ffmpeg.destroyForcibly();
+                        ffmpeg = null;
+                    }
                 }
             } catch (InterruptedException e) {
                 LOG.error("Interrupted while waiting for FFmpeg to terminate");