VideoEncoder: Fix MergeSegments() called twice on encoding stop

genail · genail · commit 735ca5abe463 · 2024-06-18T11:47:42.000+02:00
diff --git a/Runtime/Scripts/BH_VideoEncoder.cs b/Runtime/Scripts/BH_VideoEncoder.cs
@@ -182,7 +182,7 @@ public string StopEncoding()
         return mergedFilePath;
     }
 
-    private string SendStopRequestAndWait()
+    private void SendStopRequestAndWait()
     {
         if (ffmpegProcess != null && !ffmpegProcess.HasExited)
         {
@@ -203,8 +203,6 @@ private string SendStopRequestAndWait()
                 UnityEngine.Debug.LogError("Timeout while waiting for the encoding thread to stop.");
             }
         }
-
-        return MergeSegments();
     }
 
     private string MergeSegments()

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public string StopEncoding()`
`182`	`182`	`return mergedFilePath;`
`183`	`183`	`}`
`184`	`184`
`185`		`- private string SendStopRequestAndWait()`
	`185`	`+ private void SendStopRequestAndWait()`
`186`	`186`	`{`
`187`	`187`	`if (ffmpegProcess != null && !ffmpegProcess.HasExited)`
`188`	`188`	`{`
`@@ -203,8 +203,6 @@ private string SendStopRequestAndWait()`
`203`	`203`	`UnityEngine.Debug.LogError("Timeout while waiting for the encoding thread to stop.");`
`204`	`204`	`}`
`205`	`205`	`}`
`206`		`-`
`207`		`- return MergeSegments();`
`208`	`206`	`}`
`209`	`207`
`210`	`208`	`private string MergeSegments()`