Skip to content

Improve database unlock handling in Handlers.cs and fix build number in AssemblyInfo.cs #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ArtyoZ wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Improve database unlock handling in Handlers.cs and fix build number in AssemblyInfo.cs #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfb94a8
Improve database unlock handling in Handlers.cs
ArtyoZ Sep 18, 2026
de6631b
Update AssemblyInfo.cs
ArtyoZ Sep 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion KeePassNatMsg/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.0.13")]
[assembly: AssemblyVersion("2.0.17")]
20 changes: 18 additions & 2 deletions KeePassNatMsg/Protocol/Handlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,25 @@ private bool UnlockDatabase(bool triggerUnlock)
lock (_unlockLock)
{
var config = new ConfigOpt(_host.CustomConfig);
if (!_host.Database.IsOpen && config.UnlockDatabaseRequest && KeePass.UI.GlobalWindowManager.WindowCount == 0 && triggerUnlock)
if (!_host.Database.IsOpen && config.UnlockDatabaseRequest && triggerUnlock)
{
_host.MainWindow.Invoke(new System.Action(() => _host.MainWindow.OpenDatabase(_host.MainWindow.DocumentManager.ActiveDocument.LockedIoc, null, false)));
_host.MainWindow.Invoke(new System.Action(() =>
{
if (KeePass.UI.GlobalWindowManager.WindowCount == 0)
{
// No dialog open yet for this database — start a fresh one.
_host.MainWindow.OpenDatabase(_host.MainWindow.DocumentManager.ActiveDocument.LockedIoc, null, false);
}
else
{
// A dialog (likely the master-key prompt from an earlier
// triggerUnlock, or KeePass's own auto-lock prompt) may
// already be open but hidden behind other windows.
// Bring KeePass to the foreground so the user actually
// sees it, instead of silently doing nothing.
_host.MainWindow.Activate();
}
}));
}

return _host.Database.IsOpen;
Expand Down