From c34803a1acf11bd4858250d406fea52e3cbab5a5 Mon Sep 17 00:00:00 2001 From: Tranz5 Date: Fri, 7 Feb 2014 20:51:20 -0500 Subject: [PATCH] Extend fWalletUnlockMintOnly to GUI --- src/qt/walletmodel.cpp | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index df006a3..ac8b68f 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -356,6 +356,13 @@ void WalletModel::unsubscribeFromCoreSignals() WalletModel::UnlockContext WalletModel::requestUnlock() { bool was_locked = getEncryptionStatus() == Locked; + + if ((!was_locked) && fWalletUnlockMintOnly) + { + setWalletLocked(true); + was_locked = getEncryptionStatus() == Locked; + + } if(was_locked) { // Request UI to unlock wallet @@ -364,7 +371,7 @@ WalletModel::UnlockContext WalletModel::requestUnlock() // If wallet is still locked, unlock was failed or cancelled, mark context as invalid bool valid = getEncryptionStatus() != Locked; - return UnlockContext(this, valid, was_locked); + return UnlockContext(this, valid, was_locked && !fWalletUnlockMintOnly); } WalletModel::UnlockContext::UnlockContext(WalletModel *wallet, bool valid, bool relock): -- 1.7.1