From 6c9cc68449548fa4e27572bae99c5ee92fa4ff80 Mon Sep 17 00:00:00 2001 From: Evan Duffield Date: Thu, 26 Mar 2015 07:29:56 -0700 Subject: [PATCH] version 12 --- configure.ac | 2 +- src/clientversion.h | 2 +- src/masternode.cpp | 2 ++ src/masternode.h | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index d5aabefb0..03f776c75 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 11) define(_CLIENT_VERSION_REVISION, 2) -define(_CLIENT_VERSION_BUILD, 11) +define(_CLIENT_VERSION_BUILD, 12) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2015) AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@dashpay.io],[dash]) diff --git a/src/clientversion.h b/src/clientversion.h index 665c5c766..8fa27fe5b 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -12,7 +12,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 11 #define CLIENT_VERSION_REVISION 2 -#define CLIENT_VERSION_BUILD 11 +#define CLIENT_VERSION_BUILD 12 diff --git a/src/masternode.cpp b/src/masternode.cpp index c7ac56cdf..c7b5ac563 100644 --- a/src/masternode.cpp +++ b/src/masternode.cpp @@ -399,6 +399,7 @@ void CMasternodePayments::CleanPaymentList() bool CMasternodePayments::ProcessBlock(int nBlockHeight) { + if(nBlockHeight < nLastBlockHeight) return false;; if(!enabled) return false; CMasternodePaymentWinner newWinner; int nMinimumAge = mnodeman.CountEnabled(); @@ -465,6 +466,7 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight) if(AddWinningMasternode(newWinner)) { Relay(newWinner); + nLastBlockHeight = nBlockHeight; return true; } } diff --git a/src/masternode.h b/src/masternode.h index 980fd4f02..8a39ca28f 100644 --- a/src/masternode.h +++ b/src/masternode.h @@ -282,6 +282,7 @@ private: std::string strTestPubKey; std::string strMainPubKey; bool enabled; + int nLastBlockHeight; public: