From b7bcaf940d27fa8cfe89422943fbeaab7a350930 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 24 Aug 2011 22:07:26 +0200
Subject: Wallet encryption part 2: ask passphrase when needed, add menu
 options

---
 src/qt/addresstablemodel.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/qt/addresstablemodel.cpp')

diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
index bd314ba0f0..6bda1e770c 100644
--- a/src/qt/addresstablemodel.cpp
+++ b/src/qt/addresstablemodel.cpp
@@ -267,6 +267,14 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con
     else if(type == Receive)
     {
         // Generate a new address to associate with given label
+        WalletModel::UnlockContext ctx(walletModel->requestUnlock());
+        if(!ctx.isValid())
+        {
+            // Unlock wallet failed or was cancelled
+            editStatus = WALLET_UNLOCK_FAILURE;
+            return QString();
+        }
+
         strAddress = CBitcoinAddress(wallet->GetOrReuseKeyFromPool()).ToString();
     }
     else
-- 
cgit v1.2.3