Fixed --disablewallet crash

dashpay · Aug 6, 2015 · f94d980 · f94d980
1 parent fca0a6d
commit f94d980
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/init.cpp b/src/init.cpp
@@ -1499,7 +1499,7 @@ bool AppInit2(boost::thread_group& threadGroup)
  //get the mode of budget voting for this masternode
  strBudgetMode = GetArg("-budgetvotemode", "auto");
 
- if(GetBoolArg("-mnconflock", true)) {
+ if(GetBoolArg("-mnconflock", true) && pwalletMain) {
  LOCK(pwalletMain->cs_wallet);
  LogPrintf("Locking Masternodes:\n");
  uint256 mnTxHash;

diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp
@@ -149,6 +149,7 @@ void CBudgetManager::SubmitFinalBudget()
 
  //create fee tx
  CTransaction tx;
+
  if(!mapCollateral.count(tempBudget.GetHash())){
  CWalletTx wtx;
  if(!pwalletMain->GetBudgetSystemCollateralTX(wtx, tempBudget.GetHash(), false)){