mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-05 21:47:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Update edit entry widget when backing entry changes

Browse source 
* Fixes #4060
* Also fix not emitting entryModified() when history is truncated. This possibly fixes other crashes with apply button when the history is truncated and then the history page is shown with a deleted entry.
This commit is contained in:
Jonathan White 2020-05-31 10:00:11 -04:00
parent 2073f2ddc3
commit 9d10792640
4 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/gui/entry/EditEntryWidget.cpp
View file

@ -118,6 +118,14 @@ EditEntryWidget::EditEntryWidget(QWidget* parent)
setupHistory();
setupEntryUpdate();
m_entryModifiedTimer.setSingleShot(true);
m_entryModifiedTimer.setInterval(0);
connect(&m_entryModifiedTimer, &QTimer::timeout, this, [this] {
if (isVisible() && m_entry) {
setForms(m_entry);
}
});
connect(this, SIGNAL(accepted()), SLOT(acceptEntry()));
connect(this, SIGNAL(rejected()), SLOT(cancel()));
connect(this, SIGNAL(apply()), SLOT(commitEntry()));
@ -785,6 +793,8 @@ void EditEntryWidget::loadEntry(Entry* entry,
m_create = create;
m_history = history;
connect(m_entry, &Entry::entryModified, this, [this] { m_entryModifiedTimer.start(); });
if (history) {
setHeadline(QString("%1 \u2B29 %2").arg(parentName, tr("Entry history")));
} else {
@ -1130,6 +1140,10 @@ void EditEntryWidget::cancel()
void EditEntryWidget::clear()
{
if (m_entry) {
m_entry->disconnect(this);
}
m_entry = nullptr;
m_db.reset();