WinGui: Fix a crash when updating the status display.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5948 b64f7644-9d1e-0410-96f1-a4d463321fa5

4 files changed, 2 insertions, 14 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 51cf2af22..297b6a576 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -410,15 +410,6 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to {0:00.00}%,  FPS: {1:000.0},  Avg FPS: {2:000.0},  Time Remaining: {3},  Elapsed: {4:hh\\:mm\\:ss}.

-        /// </summary>

-        public static string Main_EncodeStatusDisplay {

-            get {

-                return ResourceManager.GetString("Main_EncodeStatusDisplay", resourceCulture);

-            }

-        }

-        

-        /// <summary>

         ///   Looks up a localized string similar to ,  Pending Jobs {5}.

         /// </summary>

         public static string Main_JobsPending_addon {

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 4ecd0daa9..afd114c0c 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -395,9 +395,6 @@ In order to use the QuickSync encoder, you must:
   <data name="Main_DuplicateDestinationOnQueue" xml:space="preserve">

     <value>There are jobs on the queue with the same destination path. Please choose a different path for this job.</value>

   </data>

-  <data name="Main_EncodeStatusDisplay" xml:space="preserve">

-    <value>{0:00.00}%,  FPS: {1:000.0},  Avg FPS: {2:000.0},  Time Remaining: {3},  Elapsed: {4:hh\\:mm\\:ss}</value>

-  </data>

   <data name="Main_JobsPending_addon" xml:space="preserve">

     <value>,  Pending Jobs {5}</value>

   </data>

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 5b5b95324..ca3280a2c 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1918,8 +1918,7 @@ namespace HandBrakeWPF.ViewModels
                         }

 

                         this.ProgramStatusLabel =

-                            string.Format(

-                                Resources.Main_EncodeStatusDisplay + josPending,

+                            string.Format("{0:00.00}%,  FPS: {1:000.0},  Avg FPS: {2:000.0},  Time Remaining: {3},  Elapsed: {4:hh\\:mm\\:ss}" + josPending,

                                 e.PercentComplete,

                                 e.CurrentFrameRate,

                                 e.AverageFrameRate,

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index c45299e8e..9b95d0393 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -1200,6 +1200,7 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         private void UpdatePreviewImage()

         {

+            return;

             if (delayedPreviewprocessor != null)

             {

                 delayedPreviewprocessor.PerformTask(() =>