|
@@ -90,6 +90,7 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
|
|
|
{
|
|
|
await System.Threading.Tasks.Task.Run(() =>
|
|
|
{
|
|
|
+ //当进度条消失时,结束进程(由于取消时OnOpened没有完全结束,等待OnOpened结束时就会结束)
|
|
|
for (int i = 1; App.mainWindowViewModel.IsProcessVisible != System.Windows.Visibility.Collapsed; i++)
|
|
|
{
|
|
|
try
|
|
@@ -105,9 +106,12 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
|
|
|
|
|
|
private void ConverterClear()
|
|
|
{
|
|
|
+ //取消转档
|
|
|
ConverterHelper.Clear(ConvertType);
|
|
|
+ //取消转档的进度条,防止转档还没结束,导致取消后程序崩溃,添加一个取消进度条
|
|
|
App.mainWindowViewModel.ProcessCloseBtnVisible = System.Windows.Visibility.Collapsed;
|
|
|
App.mainWindowViewModel.ProgressTitle = "Canceling";
|
|
|
+ //判断取消进度条消失逻辑
|
|
|
TaskMethod();
|
|
|
//App.mainWindowViewModel.ProgressTitle = "";
|
|
|
//App.mainWindowViewModel.IsProcessVisible = System.Windows.Visibility.Collapsed;
|