From 638bfacadd094f1211e198cb26b9113b680e664d Mon Sep 17 00:00:00 2001 From: Geoffroy Bonneville Date: Wed, 12 Sep 2018 16:49:01 +0200 Subject: [PATCH] Bug corrections --- ModernKeePass/Actions/ClipboardAction.cs | 1 + ModernKeePass/Converters/IntToSymbolConverter.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ModernKeePass/Actions/ClipboardAction.cs b/ModernKeePass/Actions/ClipboardAction.cs index 5eceb9e..5b9dab4 100644 --- a/ModernKeePass/Actions/ClipboardAction.cs +++ b/ModernKeePass/Actions/ClipboardAction.cs @@ -17,6 +17,7 @@ namespace ModernKeePass.Actions public object Execute(object sender, object parameter) { + if (string.IsNullOrEmpty(Text)) return null; var dataPackage = new DataPackage { RequestedOperation = DataPackageOperation.Copy }; dataPackage.SetText(Text); Clipboard.SetContent(dataPackage); diff --git a/ModernKeePass/Converters/IntToSymbolConverter.cs b/ModernKeePass/Converters/IntToSymbolConverter.cs index a9e1243..9f69a08 100644 --- a/ModernKeePass/Converters/IntToSymbolConverter.cs +++ b/ModernKeePass/Converters/IntToSymbolConverter.cs @@ -75,7 +75,7 @@ namespace ModernKeePass.Converters public object ConvertBack(object value, Type targetType, object parameter, string language) { var symbol = (Symbol) value; - var defaultIcon = (int?) parameter ?? -1; + var defaultIcon = parameter != null ? int.Parse(parameter as string) : -1; switch (symbol) { case Symbol.Delete: return (int)PwIcon.TrashBin;