Merge pull request cropsly#9 from gmxu/master

hiteshsondhi88 · hiteshsondhi88 · commit ca14d9ffb82e · 2014-12-24T13:56:11.000+05:30
Fix boolean checks in isFFmpegCommandRunning and killRunningProcesses
diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpeg.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpeg.java
@@ -97,12 +97,12 @@ public String getLibraryFFmpegVersion() {
 
     @Override
     public boolean isFFmpegCommandRunning() {
-        return ffmpegExecuteAsyncTask != null && ffmpegExecuteAsyncTask.isProcessCompleted();
+        return ffmpegExecuteAsyncTask != null && !ffmpegExecuteAsyncTask.isProcessCompleted();
     }
 
     @Override
     public boolean killRunningProcesses() {
-        return Util.killAsync(ffmpegLoadLibraryAsyncTask) && Util.killAsync(ffmpegExecuteAsyncTask);
+        return Util.killAsync(ffmpegLoadLibraryAsyncTask) || Util.killAsync(ffmpegExecuteAsyncTask);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -97,12 +97,12 @@ public String getLibraryFFmpegVersion() {`
`97`	`97`
`98`	`98`	`@Override`
`99`	`99`	`public boolean isFFmpegCommandRunning() {`
`100`		`- return ffmpegExecuteAsyncTask != null && ffmpegExecuteAsyncTask.isProcessCompleted();`
	`100`	`+ return ffmpegExecuteAsyncTask != null && !ffmpegExecuteAsyncTask.isProcessCompleted();`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`@Override`
`104`	`104`	`public boolean killRunningProcesses() {`
`105`		`- return Util.killAsync(ffmpegLoadLibraryAsyncTask) && Util.killAsync(ffmpegExecuteAsyncTask);`
	`105`	`+ return Util.killAsync(ffmpegLoadLibraryAsyncTask) \|\| Util.killAsync(ffmpegExecuteAsyncTask);`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`@Override`