ctbrecuser
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Fix NPE in internalStop

This commit is contained in:
0xboobface 2020-05-10 10:43:37 +02:00
parent cd5172613e
commit 3c4ef05a48
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/ctbrec/recorder/download/hls/MergedFfmpegHlsDownload.java
View File

@ -358,6 +358,7 @@ public class MergedFfmpegHlsDownload extends AbstractHlsDownload {
}
}
if (ffmpeg != null) {
try {
boolean waitFor = ffmpeg.waitFor(5, TimeUnit.MINUTES);
if (!waitFor && ffmpeg.isAlive()) {
@ -370,6 +371,7 @@ public class MergedFfmpegHlsDownload extends AbstractHlsDownload {
Thread.currentThread().interrupt();
}
}
}
private class SegmentDownload implements Callable<byte[]> {
private URL url;