diff options
author | Jeff Garzik <jgarzik@exmulti.com> | 2012-10-20 13:36:36 -0700 |
---|---|---|
committer | Jeff Garzik <jgarzik@exmulti.com> | 2012-10-20 13:36:36 -0700 |
commit | 38ac953b9df1f7a884c1ef0e94301e14c4e7477d (patch) | |
tree | 03ba74b23e9ccf077fc234e02af068cf40397fd1 /src/qt/bitcoingui.cpp | |
parent | dee0ee2ac9d6feb49eac9683c01a0eeed4389449 (diff) | |
parent | 66b02c93e69cfeaec6e7fa19a03bfb2649025a56 (diff) |
Merge pull request #1880 from sipa/threadimport
Move external block import to separate thread
Diffstat (limited to 'src/qt/bitcoingui.cpp')
-rw-r--r-- | src/qt/bitcoingui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 19a6a65a1b..0d269ea210 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -473,7 +473,7 @@ void BitcoinGUI::setNumConnections(int count) void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks) { // don't show / hide progress bar and its label if we have no connection to the network - if (!clientModel || clientModel->getNumConnections() == 0) + if (!clientModel || (clientModel->getNumConnections() == 0 && !clientModel->isImporting())) { progressBarLabel->setVisible(false); progressBar->setVisible(false); @@ -491,7 +491,7 @@ void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks) if (strStatusBarWarnings.isEmpty()) { - progressBarLabel->setText(tr("Synchronizing with network...")); + progressBarLabel->setText(tr(clientModel->isImporting() ? "Importing blocks..." : "Synchronizing with network...")); progressBarLabel->setVisible(true); progressBar->setFormat(tr("~%n block(s) remaining", "", nRemainingBlocks)); progressBar->setMaximum(nTotalBlocks); |