wismna/modernkeepasslib
1
0
Fork 0
mirror of https://github.com/wismna/ModernKeePassLib.git synced 2025-10-03 15:40:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update to KeePassLib version 2.45

Browse Source
This commit is contained in:
Geoffroy BONNEVILLE
2020-05-12 12:46:25 +02:00
parent 107e009807
commit 2e1cc97738
21 changed files with 166 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ModernKeePassLib/Native/ClipboardU.cs
View File

@@ -1,6 +1,6 @@
/*
KeePass Password Safe - The Open-Source Password Manager
Copyright (C) 2003-2018 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2003-2020 Dominik Reichl <dominik.reichl@t-online.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ namespace ModernKeePassLib.Native
{
internal static class ClipboardU
{
private const string XSel = "xsel";
internal const string XSel = "xsel";
private const string XSelV = "--version";
private const string XSelR = "--output --clipboard";
private const string XSelC = "--clear --clipboard";

9
ModernKeePassLib/Native/NativeLib.cs
View File

@@ -19,6 +19,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Reflection;
using System.Runtime.InteropServices;
@@ -273,7 +274,13 @@ namespace ModernKeePassLib.Native
return strOutput;
}
#if DEBUG
catch(Exception ex) { Debug.Assert(ex is ThreadAbortException); }
catch(ThreadAbortException) { }
catch(Win32Exception exW)
{
Debug.Assert((strAppPath == ClipboardU.XSel) &&
(exW.NativeErrorCode == 2)); // XSel not found
}
catch(Exception) { Debug.Assert(false); }
#else
catch(Exception) { }
#endif