• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythonbathyscaphephpgamewindowsguic翻訳omegattwitterframeworktestbtronarduinovb.net計画中(planning stage)directxpreviewerゲームエンジンdom

githubのコードからのfolk


Commit MetaInfo

Revisionb0852001f68d86d925b6dba7a92d63cfb51f3e72 (tree)
Time2011-02-28 01:33:55
Authorsr55 <sr55@b64f...>
Commitersr55

Log Message

WinGui:
- Fix an issue that was causing queue processing to crash out.

git-svn-id: svn://localhost/HandBrake/trunk@3817 b64f7644-9d1e-0410-96f1-a4d463321fa5

Change Summary

Incremental Difference

--- a/win/C#/HandBrake.ApplicationServices/Services/Encode.cs
+++ b/win/C#/HandBrake.ApplicationServices/Services/Encode.cs
@@ -376,7 +376,6 @@ namespace HandBrake.ApplicationServices.Services
376376 Thread.Sleep(2500);
377377
378378 this.HbProcess.CancelErrorRead();
379- this.HbProcess.CancelOutputRead();
380379
381380 if (fileWriter != null)
382381 {
--- a/win/C#/HandBrake.ApplicationServices/Services/QueueProcessor.cs
+++ b/win/C#/HandBrake.ApplicationServices/Services/QueueProcessor.cs
@@ -197,6 +197,12 @@ namespace HandBrake.ApplicationServices.Services
197197 GrowlCommunicator.Notify("Encode Completed",
198198 "Put down that cocktail...\nyour Handbrake encode is done.");
199199
200+ if (!e.Successful)
201+ {
202+ this.Pause();
203+ MessageBox.Show(e.Exception + e.ErrorInformation);
204+ }
205+
200206 // Handling Log Data
201207 this.EncodeService.ProcessLogs(this.QueueManager.LastProcessedJob.Destination);
202208
@@ -209,9 +215,10 @@ namespace HandBrake.ApplicationServices.Services
209215 /// </summary>
210216 private void ProcessNextJob()
211217 {
212- if (this.EncodeService.IsEncoding)
218+ if (this.EncodeService.IsEncoding || !this.IsProcessing)
213219 {
214220 // We don't want to try start a second encode, so just return out. The event will trigger the next encode automatically.
221+ // Also, we don't want to start a new encode if we are paused.
215222 return;
216223 }
217224