From c9d007fcdf8fb81336f1667d76e964516c40707b Mon Sep 17 00:00:00 2001
From: Amir Pakdel <pakdel@gmail.com>
Date: Tue, 12 May 2015 16:31:14 -0400
Subject: [PATCH] Always clearing ChangeMasterKeyWidget.m_key

---
 src/gui/ChangeMasterKeyWidget.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/gui/ChangeMasterKeyWidget.cpp b/src/gui/ChangeMasterKeyWidget.cpp
index ee0c8b106..3e346bc10 100644
--- a/src/gui/ChangeMasterKeyWidget.cpp
+++ b/src/gui/ChangeMasterKeyWidget.cpp
@@ -96,7 +96,7 @@ QLabel* ChangeMasterKeyWidget::headlineLabel()
 
 void ChangeMasterKeyWidget::generateKey()
 {
-    bool cleared = false;
+    m_key.clear();
 
     if (m_ui->passwordGroup->isChecked()) {
         if (m_ui->enterPasswordEdit->text() == m_ui->repeatPasswordEdit->text()) {
@@ -107,8 +107,6 @@ void ChangeMasterKeyWidget::generateKey()
                     return;
                 }
             }
-            m_key.clear();
-            cleared = true;
             m_key.addKey(PasswordKey(m_ui->enterPasswordEdit->text()));
         }
         else {
@@ -127,7 +125,6 @@ void ChangeMasterKeyWidget::generateKey()
                                  .arg(m_ui->keyFileCombo->currentText(), errorMsg));
             return;
         }
-        if (!cleared) m_key.clear();
         m_key.addKey(fileKey);
     }