Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 1 insertions, 6 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index f9ec5b063..148e4375c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -460,11 +460,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
         public RelayCommand MediaTogglePlayPauseCommand { get; set; }
 
         /// <summary>
-        /// Gets or sets the media load file command.
-        /// </summary>
-        public RelayCommand MediaLoadFileCommand { get; set; }
-
-        /// <summary>
         /// Gets or sets the media play pause command.
         /// </summary>
         public RelayCommand MediaPlayPauseCommand { get; set; }
@@ -916,7 +911,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         private void UpdateEstimatedDuration()
         {
-            if (SelectedJob != null && SelectedProcessParametersTable != null)
+            if (SelectedJob != null && SelectedProcessParametersTable != null && SelectedProcessParametersTable.DyeingSpeed > 0)
             {
                 EstimatedDuration = TimeSpan.FromSeconds(SelectedJob.Length / (SelectedProcessParametersTable.DyeingSpeed / 100d));
             }