diff options
| author | MeshCollider <dobsonsa68@gmail.com> | 2017-09-06 10:49:36 +1200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-10-03 19:19:46 +0200 |
| commit | 2e31b1d48d4da31bf32e1e4123c7e5d662490826 (patch) | |
| tree | 4f724420b8cea2c67c506020a55b3d9473b29415 /src/qt | |
| parent | 47c02a8ae8b406a1a7d7004b2a0337a1f32420e9 (diff) | |
| download | bitcoin-2e31b1d48d4da31bf32e1e4123c7e5d662490826.tar.xz | |
Fix division by zero in time remaining
Github-Pull: #11237
Rebased-From: 3b69a08c53c2ef738f32c270fdacf1e4ed5a4c97
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/modaloverlay.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp index a83f285034..4f357e297d 100644 --- a/src/qt/modaloverlay.cpp +++ b/src/qt/modaloverlay.cpp @@ -99,15 +99,18 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri progressDelta = progressStart-sample.second; timeDelta = blockProcessTime[0].first - sample.first; progressPerHour = progressDelta/(double)timeDelta*1000*3600; - remainingMSecs = remainingProgress / progressDelta * timeDelta; + remainingMSecs = (progressDelta > 0) ? remainingProgress / progressDelta * timeDelta : -1; break; } } // show progress increase per hour ui->progressIncreasePerH->setText(QString::number(progressPerHour*100, 'f', 2)+"%"); - // show expected remaining time - ui->expectedTimeLeft->setText(GUIUtil::formatNiceTimeOffset(remainingMSecs/1000.0)); + if(remainingMSecs >= 0) { + ui->expectedTimeLeft->setText(GUIUtil::formatNiceTimeOffset(remainingMSecs / 1000.0)); + } else { + ui->expectedTimeLeft->setText(QObject::tr("unknown")); + } static const int MAX_SAMPLES = 5000; if (blockProcessTime.count() > MAX_SAMPLES) @@ -169,4 +172,4 @@ void ModalOverlay::closeClicked() { showHide(true); userClosed = true; -} +}
\ No newline at end of file |