diff options
| author | Pieter Wuille <[email protected]> | 2012-09-13 14:33:52 +0200 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2012-10-20 01:54:10 +0200 |
| commit | 66b02c93e69cfeaec6e7fa19a03bfb2649025a56 (patch) | |
| tree | 414db7d5088d03e29963974fce490567e25e8649 /src/init.cpp | |
| parent | Revert "Merge pull request #1931 from laanwj/2012_10_newicons" (diff) | |
| download | discoin-66b02c93e69cfeaec6e7fa19a03bfb2649025a56.tar.xz discoin-66b02c93e69cfeaec6e7fa19a03bfb2649025a56.zip | |
Move external block import to separate thread
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/src/init.cpp b/src/init.cpp index 8a928218b..92c752a8f 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -776,29 +776,13 @@ bool AppInit2() // ********************************************************* Step 9: import blocks + std::vector<boost::filesystem::path> *vPath = new std::vector<boost::filesystem::path>(); if (mapArgs.count("-loadblock")) { - uiInterface.InitMessage(_("Importing blockchain data file.")); - BOOST_FOREACH(string strFile, mapMultiArgs["-loadblock"]) - { - FILE *file = fopen(strFile.c_str(), "rb"); - if (file) - LoadExternalBlockFile(file); - } - } - - filesystem::path pathBootstrap = GetDataDir() / "bootstrap.dat"; - if (filesystem::exists(pathBootstrap)) { - uiInterface.InitMessage(_("Importing bootstrap blockchain data file.")); - - FILE *file = fopen(pathBootstrap.string().c_str(), "rb"); - if (file) { - filesystem::path pathBootstrapOld = GetDataDir() / "bootstrap.dat.old"; - LoadExternalBlockFile(file); - RenameOver(pathBootstrap, pathBootstrapOld); - } + vPath->push_back(strFile); } + NewThread(ThreadImport, vPath); // ********************************************************* Step 10: load peers |