diff options
| author | Gavin Andresen <[email protected]> | 2013-01-29 19:37:44 -0800 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2013-01-29 19:37:44 -0800 |
| commit | db3b4ade7ba8a91afaa649177d5f297f20eb40fd (patch) | |
| tree | 9a03e88480630844c8732379b2b7286313b1b901 /src/init.cpp | |
| parent | Merge branch 'master' of github.com:bitcoin/bitcoin (diff) | |
| parent | Deal with LevelDB errors (diff) | |
| download | discoin-db3b4ade7ba8a91afaa649177d5f297f20eb40fd.tar.xz discoin-db3b4ade7ba8a91afaa649177d5f297f20eb40fd.zip | |
Merge pull request #2224 from sipa/valstate
Improve error handling during validation
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index 9b9415a8e..2f37dad56 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -187,9 +187,9 @@ bool AppInit(int argc, char* argv[]) fRet = AppInit2(); } catch (std::exception& e) { - PrintException(&e, "AppInit()"); + PrintExceptionContinue(&e, "AppInit()"); } catch (...) { - PrintException(NULL, "AppInit()"); + PrintExceptionContinue(NULL, "AppInit()"); } if (!fRet) Shutdown(NULL); @@ -936,7 +936,8 @@ bool AppInit2() // scan for better chains in the block chain database, that are not yet connected in the active best chain uiInterface.InitMessage(_("Importing blocks from block database...")); - if (!ConnectBestBlock()) + CValidationState state; + if (!ConnectBestBlock(state)) strErrors << "Failed to connect best block"; CImportData *pimport = new CImportData(); |