@@ -226,12 +226,18 @@ namespace PDF_Master.CustomControl
private void ChbDonotAskAgain_Checked(object sender, RoutedEventArgs e)
{
- isChecked = true;
+ if (IsLoaded)
+ {
+ isChecked = true;
+ }
}
private void ChbDonotAskAgain_Unchecked(object sender, RoutedEventArgs e)
- isChecked = false;
+ isChecked = false;
@@ -516,6 +516,12 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs
doc.Release();
continue;
+ //添加的第一个文档有权限密码时,保存密码,避免合并时因没有密码导致合并失败
+ //表现为在首页打开一个带权限的文档进入合并,点击合并按钮没有反应
+ if (!string.IsNullOrEmpty(currentLoadedPassword))
+ mergeObject.Password = currentLoadedPassword;
else
@@ -1995,7 +1995,7 @@ namespace PDF_Master.ViewModels
private void TabControlSelectonChangedEvent(object e)
var args = e as SelectionChangedEventArgs;
- if (args != null)
+ if (args != null&&args.AddedItems.Count>0)
var item = args.AddedItems[0] as TabItem;
CurrentBar = item.Name;