From 3c4ef05a48f7df45a21af23098d563abe1c5a5bb Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Sun, 10 May 2020 10:43:37 +0200
Subject: [PATCH] Fix NPE in internalStop

---
 .../download/hls/MergedFfmpegHlsDownload.java | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 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 50df4f0e..e242f82e 100644
--- a/common/src/main/java/ctbrec/recorder/download/hls/MergedFfmpegHlsDownload.java
+++ b/common/src/main/java/ctbrec/recorder/download/hls/MergedFfmpegHlsDownload.java
@@ -358,16 +358,18 @@ public class MergedFfmpegHlsDownload extends AbstractHlsDownload {
             }
         }
 
-        try {
-            boolean waitFor = ffmpeg.waitFor(5, TimeUnit.MINUTES);
-            if (!waitFor && ffmpeg.isAlive()) {
-                LOG.info("FFmpeg didn't terminate. Destroying the process with force!");
-                ffmpeg.destroyForcibly();
-                ffmpeg = null;
+        if (ffmpeg != null) {
+            try {
+                boolean waitFor = ffmpeg.waitFor(5, TimeUnit.MINUTES);
+                if (!waitFor && 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");
+                Thread.currentThread().interrupt();
             }
-        } catch (InterruptedException e) {
-            LOG.error("Interrupted while waiting for FFmpeg to terminate");
-            Thread.currentThread().interrupt();
         }
     }