From 9a52925d5c81f2dcfb3430b9bece01f63d1e9aa6 Mon Sep 17 00:00:00 2001 From: Evan Duffield Date: Thu, 3 Mar 2016 07:00:34 -0700 Subject: [PATCH] fixed messages --- .gitignore | 1 + src/init.cpp | 7 +++++++ src/masternode-budget.cpp | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fa5da47d3d..3697e5009b 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,4 @@ share/BitcoindComparisonTool.jar /doc/doxygen/ libbitcoinconsensus.pc +src/qt/dash-qt.bash \ No newline at end of file diff --git a/src/init.cpp b/src/init.cpp index 2af5827a01..6b8ea4c9bd 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1812,9 +1812,12 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) uiInterface.InitMessage(_("Loading budget cache...")); + printf("1\n"); CBudgetDB budgetdb; CBudgetDB::ReadResult readResult2 = budgetdb.Read(budget); + printf("2\n"); + if (readResult2 == CBudgetDB::FileError) LogPrintf("Missing budget cache - budget.dat, will try to recreate\n"); else if (readResult2 != CBudgetDB::Ok) @@ -1826,8 +1829,12 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) LogPrintf("file format is unknown or invalid, please fix it manually\n"); } + printf("3\n"); + //flag our cached items so we send them to our peers budget.ResetSync(); + + printf("4 \n"); budget.ClearSeen(); diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp index 942894ea9b..7c7cf15c9f 100644 --- a/src/masternode-budget.cpp +++ b/src/masternode-budget.cpp @@ -235,7 +235,7 @@ bool CBudgetDB::Write(const CBudgetManager& objToSave) CBudgetDB::ReadResult CBudgetDB::Read(CBudgetManager& objToLoad, bool fDryRun) { - LOCK(objToLoad.cs); + //LOCK(objToLoad.cs); int64_t nStart = GetTimeMillis(); // open input file, and associate with CAutoFile