summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
diff options
context:
space:
mode:
authorsr55 <[email protected]>2016-07-15 22:15:20 +0100
committersr55 <[email protected]>2016-07-15 22:15:20 +0100
commit14b65e62a20a29d76b5225d19c7c5e05b157dcaa (patch)
treea291b08054615e8cc92fc2e5dca14082ca35a893 /win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
parent0a3c01884209064e7e8a31c0b46b51c108d36691 (diff)
WinGui: Change the handling of "Already Processing" dialog that can appear when pressing Start Encode if the events run out of sequence. The GUI just handles it appropiatly now. Should fix #211
Diffstat (limited to 'win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs')
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index eefe8fd50..c6225a525 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1542,7 +1542,7 @@ namespace HandBrakeWPF.ViewModels
{
if (this.queueProcessor.IsProcessing)
{
- this.errorService.ShowMessageBox(Resources.Main_AlreadyEncoding, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ this.IsEncoding = true;
return;
}
@@ -1589,8 +1589,8 @@ namespace HandBrakeWPF.ViewModels
// Create the Queue Task and Start Processing
if (this.AddToQueue())
{
- this.queueProcessor.Start(this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearCompletedFromQueue));
this.IsEncoding = true;
+ this.queueProcessor.Start(this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearCompletedFromQueue));
}
}