Merge pull request #514 from UdjinM6/v0.12.0.x_fix_overview_upd

V0.12.0.x fix overview page updates on options change and on DS toggle
This commit is contained in:
evan82 2015-08-11 19:05:49 -07:00
commit 5e9fbabd90
3 changed files with 4 additions and 4 deletions

View File

@ -332,7 +332,7 @@ public:
to behave themselves. If they don't it takes their money. */ to behave themselves. If they don't it takes their money. */
cachedLastSuccess = 0; cachedLastSuccess = 0;
cachedNumBlocks = 0; cachedNumBlocks = std::numeric_limits<int>::max();
unitTest = false; unitTest = false;
txCollateral = CMutableTransaction(); txCollateral = CMutableTransaction();
minBlockSpacing = 0; minBlockSpacing = 0;

View File

@ -251,7 +251,7 @@ void OptionsDialog::on_resetButton_clicked()
void OptionsDialog::on_okButton_clicked() void OptionsDialog::on_okButton_clicked()
{ {
mapper->submit(); mapper->submit();
darkSendPool.cachedNumBlocks = 0; darkSendPool.cachedNumBlocks = std::numeric_limits<int>::max();
pwalletMain->MarkDirty(); pwalletMain->MarkDirty();
accept(); accept();
} }

View File

@ -517,7 +517,7 @@ void OverviewPage::toggleDarksend(){
if(!ctx.isValid()) if(!ctx.isValid())
{ {
//unlock was cancelled //unlock was cancelled
darkSendPool.cachedNumBlocks = 0; darkSendPool.cachedNumBlocks = std::numeric_limits<int>::max();
QMessageBox::warning(this, tr("Darksend"), QMessageBox::warning(this, tr("Darksend"),
tr("Wallet is locked and user declined to unlock. Disabling Darksend."), tr("Wallet is locked and user declined to unlock. Disabling Darksend."),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Ok, QMessageBox::Ok);
@ -528,8 +528,8 @@ void OverviewPage::toggleDarksend(){
} }
darkSendPool.cachedNumBlocks = 0;
fEnableDarksend = !fEnableDarksend; fEnableDarksend = !fEnableDarksend;
darkSendPool.cachedNumBlocks = std::numeric_limits<int>::max();
if(!fEnableDarksend){ if(!fEnableDarksend){
ui->toggleDarksend->setText(tr("Start Darksend Mixing")); ui->toggleDarksend->setText(tr("Start Darksend Mixing"));