Mercurial > hg > bitcoin

diff src/qt/sendcoinsdialog.cpp @ 1271:052a2a34f756 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Wallet encryption part 2: ask passphrase when needed, add menu options
author Wladimir J. van der Laan <laanwj@gmail.com>
date Wed, 24 Aug 2011 22:07:26 +0200
parents d0d7e33253e5
children 310e1e69448b
line wrap: on
line diff
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -6,6 +6,7 @@
 #include "optionsmodel.h"
 #include "sendcoinsentry.h"
 #include "guiutil.h"
+#include "askpassphrasedialog.h"
 
 #include <QMessageBox>
 #include <QLocale>
@@ -84,6 +85,13 @@
         return;
     }
 
+    WalletModel::UnlockContext ctx(model->requestUnlock());
+    if(!ctx.isValid())
+    {
+        // Unlock wallet was cancelled
+        return;
+    }
+
     WalletModel::SendCoinsReturn sendstatus = model->sendCoins(recipients);
     switch(sendstatus.status)
     {
@@ -118,7 +126,6 @@
             tr("Error: Transaction creation failed  "),
             QMessageBox::Ok, QMessageBox::Ok);
         break;
-        break;
     case WalletModel::TransactionCommitFailed:
         QMessageBox::warning(this, tr("Send Coins"),
             tr("Error: The transaction was rejected.  This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."),