WinGui: Broke Status display. Fixed.

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

3 files changed, 1 insertions, 15 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
index 6ccc50777..67dcf4c09 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
@@ -22,11 +22,6 @@ namespace HandBrakeWPF.ViewModels.Interfaces
         Preset SelectedPreset { set; }

 

         /// <summary>

-        /// Gets or Sets IsInstandHandBrake.

-        /// </summary>

-        bool IsInstandHandBrake { get; set; }

-

-        /// <summary>

         /// Shutdown the Application

         /// </summary>

         void ExitApplication();

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 1e3754de7..bb9dbed9a 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -927,11 +927,6 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         public int ProgressPercentage { get; set; }

 

-        /// <summary>

-        /// Gets or sets a value indicating whether the app is in "instant" mode

-        /// </summary>

-        public bool IsInstandHandBrake { get; set; }

-

         #endregion

 

         #region Load and Shutdown Handling

@@ -1912,7 +1907,7 @@ namespace HandBrakeWPF.ViewModels
                     if (this.queueProcessor.EncodeService.IsEncoding)

                     {

                         string josPending = string.Empty;

-                        if (this.IsInstandHandBrake)

+                        if (!AppArguments.IsInstantHandBrake)

                         {

                             josPending = ",  Pending Jobs {5}";

                         }

diff --git a/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
index 4a4aebf43..565dfda76 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
@@ -88,28 +88,24 @@ namespace HandBrakeWPF.ViewModels
                 this.ShowMainWindow = true;

                 this.ShowOptions = false;

                 this.ShowInstant = false;

-                this.MainViewModel.IsInstandHandBrake = false;

             }

             else if (window == ShellWindow.OptionsWindow)

             {

                 this.ShowOptions = true;

                 this.ShowMainWindow = false;

                 this.ShowInstant = false;

-                this.MainViewModel.IsInstandHandBrake = false;

             }

             else if (window == ShellWindow.InstantMainWindow)

             {

                 this.ShowInstant = true;

                 this.ShowOptions = false;

                 this.ShowMainWindow = false;

-                this.MainViewModel.IsInstandHandBrake = true;

             }

             else

             {

                 this.ShowMainWindow = true;

                 this.ShowOptions = false;

                 this.ShowInstant = false;

-                this.MainViewModel.IsInstandHandBrake = false;

             }

         }