githubのコードからのfolk
Revision | b0852001f68d86d925b6dba7a92d63cfb51f3e72 (tree) |
---|---|
Time | 2011-02-28 01:33:55 |
Author | sr55 <sr55@b64f...> |
Commiter | sr55 |
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
@@ -376,7 +376,6 @@ namespace HandBrake.ApplicationServices.Services | ||
376 | 376 | Thread.Sleep(2500); |
377 | 377 | |
378 | 378 | this.HbProcess.CancelErrorRead(); |
379 | - this.HbProcess.CancelOutputRead(); | |
380 | 379 | |
381 | 380 | if (fileWriter != null) |
382 | 381 | { |
@@ -197,6 +197,12 @@ namespace HandBrake.ApplicationServices.Services | ||
197 | 197 | GrowlCommunicator.Notify("Encode Completed", |
198 | 198 | "Put down that cocktail...\nyour Handbrake encode is done."); |
199 | 199 | |
200 | + if (!e.Successful) | |
201 | + { | |
202 | + this.Pause(); | |
203 | + MessageBox.Show(e.Exception + e.ErrorInformation); | |
204 | + } | |
205 | + | |
200 | 206 | // Handling Log Data |
201 | 207 | this.EncodeService.ProcessLogs(this.QueueManager.LastProcessedJob.Destination); |
202 | 208 |
@@ -209,9 +215,10 @@ namespace HandBrake.ApplicationServices.Services | ||
209 | 215 | /// </summary> |
210 | 216 | private void ProcessNextJob() |
211 | 217 | { |
212 | - if (this.EncodeService.IsEncoding) | |
218 | + if (this.EncodeService.IsEncoding || !this.IsProcessing) | |
213 | 219 | { |
214 | 220 | // 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. | |
215 | 222 | return; |
216 | 223 | } |
217 | 224 |