fix unlock for staking

this fixes issue #42
noirofficial · Apr 7, 2020 · 6e9f34a · 6e9f34a
1 parent 50bfa5a
commit 6e9f34a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp
@@ -70,6 +70,7 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget *parent, QLabel *isS
             ui->passLabel3->hide();
             ui->passEdit3->hide();
             ui->unlockForStakingOnlyCheckBox->show();
+            ui->unlockForStakingOnlyCheckBox->setChecked(true);
             ui->unlockForStakingOnlyLabel->show();
             setWindowTitle(tr("Unlock wallet"));
             break;

diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
@@ -216,7 +216,7 @@ void WalletFrame::unlockForStaking()
 {
     WalletView *walletView = currentWalletView();
     if (walletView)
-        walletView->unlockWallet(true);
+        walletView->unlockWallet(true, true);
 }
 
 void WalletFrame::lockWallet()

diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
@@ -422,15 +422,15 @@ void WalletView::changePassphrase()
     dlg.exec();
 }
 
-void WalletView::unlockWallet(bool iconClicked)
+void WalletView::unlockWallet(bool iconClicked, bool fStaking)
 {
     if(!walletModel)
         return;
     // Unlock wallet when requested by wallet model
     if (walletModel->getEncryptionStatus() == WalletModel::Locked
         || (!iconClicked && walletModel->getEncryptionStatus() == WalletModel::UnlockedForStaking))
     {
-        AskPassphraseDialog dlg(AskPassphraseDialog::Unlock, this);
+        AskPassphraseDialog dlg(fStaking ? AskPassphraseDialog::UnlockManual : AskPassphraseDialog::Unlock, this);
         dlg.setModel(walletModel);
         dlg.exec();
     }

diff --git a/src/qt/walletview.h b/src/qt/walletview.h
@@ -141,7 +141,7 @@ public Q_SLOTS:
     /** Change encrypted wallet passphrase */
     void changePassphrase();
     /** Ask for passphrase to unlock wallet temporarily */
-    void unlockWallet(bool iconClicked=false);
+    void unlockWallet(bool iconClicked=false, bool fStaking = false);
     /** lock wallet */
     void lockWallet();