From 7b25fe9cc6907f8bfafd2b54e9b32e864dd55e9b Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Sat, 7 Mar 2020 09:52:51 -0500
Subject: [PATCH] Set expiration time to Now when enabling entry expiration

* Fixes #3940
---
 src/gui/entry/EditEntryWidget.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index d52657430..2d7cd24dd 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -158,7 +158,13 @@ void EditEntryWidget::setupMain()
     connect(m_mainUi->urlEdit, SIGNAL(textChanged(QString)), m_iconsWidget, SLOT(setUrl(QString)));
     m_mainUi->urlEdit->enableVerifyMode();
 #endif
-    connect(m_mainUi->expireCheck, SIGNAL(toggled(bool)), m_mainUi->expireDatePicker, SLOT(setEnabled(bool)));
+    connect(m_mainUi->expireCheck, &QCheckBox::toggled, [&](bool enabled) {
+        m_mainUi->expireDatePicker->setEnabled(enabled);
+        if (enabled) {
+            m_mainUi->expireDatePicker->setDateTime(Clock::currentDateTime());
+        }
+    });
+
     connect(m_mainUi->notesEnabled, SIGNAL(toggled(bool)), this, SLOT(toggleHideNotes(bool)));
 
     m_mainUi->expirePresets->setMenu(createPresetsMenu());