diff options
| author | sr55 <[email protected]> | 2018-07-08 14:17:17 +0100 |
|---|---|---|
| committer | sr55 <[email protected]> | 2018-07-08 14:17:17 +0100 |
| commit | 80fa15a3901017253e35bb2df064133258edcd2a (patch) | |
| tree | eb1d63cc3441bb9c7b94ad464011689b9c21c520 /win/CS/HandBrakeWPF/ViewModels | |
| parent | 325cb484bfeccb2fa371c7af010c4eb4839c5f37 (diff) | |
WinGui: Initial work to refactor the queue infrastructure to use the same JSON format as the CLI + extensions.
Diffstat (limited to 'win/CS/HandBrakeWPF/ViewModels')
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 2 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 11960ec39..e1bf5f50d 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -2284,7 +2284,7 @@ namespace HandBrakeWPF.ViewModels /* TODO Fix this. */
Execute.OnUIThread(() =>
{
- if (this.queueEditTask != null && this.selectedPreset.Name != this.queueEditTask.SelectedPresetKey)
+ if (this.queueEditTask != null && !string.IsNullOrEmpty(this.queueEditTask.SelectedPresetKey) && this.selectedPreset.Name != this.queueEditTask.SelectedPresetKey)
{
Preset foundPreset = this.presetService.GetPreset(this.queueEditTask.SelectedPresetKey);
if (foundPreset != null)
diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs index 6f8e8c176..c6fa2848a 100644 --- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs @@ -444,7 +444,7 @@ namespace HandBrakeWPF.ViewModels OpenFileDialog dialog = new OpenFileDialog { Filter = "Json (*.json)|*.json", CheckFileExists = true };
if (dialog.ShowDialog() == true)
{
- this.queueProcessor.RestoreQueue(dialog.FileName);
+ this.queueProcessor.ImportJson(dialog.FileName);
}
}
|