X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmQueue.cs;h=2684772bbd8cfedbadf1b3a2d5ede9526ee010c6;hb=4560ade3c833f282f02d15a9473e233488617df9;hp=85ffde8e6930a11d3d416d17ca614a8fd5217338;hpb=84d2ac63386023c9a4c7af3b78339956600dfe76;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index 85ffde8e..2684772b 100644
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -9,6 +9,7 @@ namespace Handbrake
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
     using System.ComponentModel;
+    using System.IO;
     using System.Windows.Forms;
     using Functions;
 
@@ -130,7 +131,7 @@ namespace Handbrake
                 string.Format(
                 "Encoding: Pass {0} of {1}, {2:00.00}% Time Remaining: {3}",
                 e.Task,
-                e.Task,
+                e.TaskCount,
                 e.PercentComplete,
                 e.EstimatedTimeLeft);
         }
@@ -506,7 +507,7 @@ namespace Handbrake
         /// </param>
         private void ListQueueDeleteKey(object sender, KeyEventArgs e)
         {
-            if (e.KeyCode == Keys.Delete)
+            if (e.KeyCode == Keys.Delete && e.Modifiers == Keys.None)
                 DeleteSelectedItems();
         }
 
@@ -664,7 +665,7 @@ namespace Handbrake
         /// </param>
         private void MnuReaddClick(object sender, EventArgs e)
         {
-            if (!queue.LastEncode.IsEmpty)
+            if (queue.LastEncode != null && !queue.LastEncode.IsEmpty)
             {
                 queue.Add(
                     queue.LastEncode.Query, 
@@ -702,6 +703,7 @@ namespace Handbrake
         private void CompleteOptionChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.CompletionOption = drp_completeOption.Text;
+            HandBrake.ApplicationServices.Init.CompletionOption = drp_completeOption.Text;
             Properties.Settings.Default.Save();
         }
     }