From 48f8b1a1165958e49de82ba6d62144f0df777961 Mon Sep 17 00:00:00 2001
From: Florian Geyer <blueice@fobos.de>
Date: Wed, 18 Apr 2012 15:23:46 +0200
Subject: [PATCH] Do not partly update an entry when different passwords are
 supplied.

---
 src/gui/EditEntryWidget.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/EditEntryWidget.cpp b/src/gui/EditEntryWidget.cpp
index 89c957643..6621fdfea 100644
--- a/src/gui/EditEntryWidget.cpp
+++ b/src/gui/EditEntryWidget.cpp
@@ -123,13 +123,13 @@ void EditEntryWidget::loadEntry(Entry* entry, bool create, const QString& groupN
 
 void EditEntryWidget::saveEntry()
 {
-    m_entry->setTitle(m_mainUi->titleEdit->text());
-    m_entry->setUsername(m_mainUi->usernameEdit->text());
-    m_entry->setUrl(m_mainUi->urlEdit->text());
     if (!passwordsEqual()) {
         QMessageBox::warning(this, tr("Error"), tr("Different passwords supplied."));
         return;
     }
+    m_entry->setTitle(m_mainUi->titleEdit->text());
+    m_entry->setUsername(m_mainUi->usernameEdit->text());
+    m_entry->setUrl(m_mainUi->urlEdit->text());
     m_entry->setPassword(m_mainUi->passwordEdit->text());
     m_entry->setExpires(m_mainUi->expireCheck->isChecked());
     QDateTime dateTime(m_mainUi->expireDatePicker->dateTime());