handling cancel on window close

yermak · Jan 18, 2018 · 3ea8696 · 3ea8696
1 parent 18fef91
commit 3ea8696
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/uk/yermak/audiobookconverter/FFMpegConcatenator.java b/src/main/java/uk/yermak/audiobookconverter/FFMpegConcatenator.java
@@ -85,18 +85,21 @@ public void concat() throws IOException, ExecutionException, InterruptedExceptio
 
     @Override
     public void finishedWithError(String error) {
-
+        Utils.closeSilently(executorService);
+//        Utils.closeSilently(progressParser);
     }
 
     @Override
     public void finished() {
-
+        Utils.closeSilently(executorService);
+//        Utils.closeSilently(progressParser);
     }
 
     @Override
     public void canceled() {
         cancelled = true;
         Utils.closeSilently(executorService);
+//        Utils.closeSilently(progressParser);
     }
 
     @Override

diff --git a/src/main/java/uk/yermak/audiobookconverter/FFMpegConverter.java b/src/main/java/uk/yermak/audiobookconverter/FFMpegConverter.java
@@ -22,6 +22,7 @@ public class FFMpegConverter implements Callable<ConverterOutput>, Converter, St
     private boolean paused;
     private Process process;
     private final static String FFMPEG = new File("external/x64/ffmpeg.exe").getAbsolutePath();
+    private ProgressParser progressParser = null;
 
 
     public FFMpegConverter(MediaInfo mediaInfo, String outputFileName, ProgressCallback callback) {
@@ -32,7 +33,6 @@ public FFMpegConverter(MediaInfo mediaInfo, String outputFileName, ProgressCallb
     }
 
     public ConverterOutput convertMp3toM4a() throws IOException, InterruptedException, ExecutionException {
-        ProgressParser progressParser = null;
         try {
             mutex.acquire();
             if (cancelled) return null;
@@ -90,17 +90,21 @@ public ConverterOutput call() throws Exception {
 
     @Override
     public void finishedWithError(String error) {
-
+        Utils.closeSilently(executorService);
+//        Utils.closeSilently(progressParser);
     }
 
     @Override
     public void finished() {
+        Utils.closeSilently(executorService);
+//        Utils.closeSilently(progressParser);
     }
 
     @Override
     public void canceled() {
         this.cancelled = true;
         Utils.closeSilently(executorService);
+//        Utils.closeSilently(progressParser);
     }
 
     @Override

diff --git a/src/main/java/uk/yermak/audiobookconverter/ParallelConversionStrategy.java b/src/main/java/uk/yermak/audiobookconverter/ParallelConversionStrategy.java
@@ -23,7 +23,7 @@ public class ParallelConversionStrategy extends AbstractConversionStrategy imple
 
 
     protected void startConversion() {
-        Executors.newWorkStealingPool().execute(this);
+        executorService.execute(this);
     }
 
     public void run() {