diff options
-rw-r--r-- | src/clientversion.h | 2 | ||||
-rw-r--r-- | src/qt/paymentserver.cpp | 2 | ||||
-rw-r--r-- | src/qt/walletmodel.cpp | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/clientversion.h b/src/clientversion.h index b376a67c8a..a06ceb7505 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -19,7 +19,7 @@ // Copyright year (2009-this) // Todo: update this when changing our copyright comments in the source -#define COPYRIGHT_YEAR 2013 +#define COPYRIGHT_YEAR 2014 #endif //HAVE_CONFIG_H diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index e22ac43fb2..7642cd117a 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -8,8 +8,6 @@ #include "guiconstants.h" #include "guiutil.h" #include "optionsmodel.h" -#include "paymentserver.h" -#include "walletmodel.h" #include "base58.h" #include "ui_interface.h" diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 6f3e3b0aaf..14f29c933b 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -488,6 +488,7 @@ bool WalletModel::getPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const // returns a list of COutputs from COutPoints void WalletModel::getOutputs(const std::vector<COutPoint>& vOutpoints, std::vector<COutput>& vOutputs) { + LOCK(wallet->cs_wallet); BOOST_FOREACH(const COutPoint& outpoint, vOutpoints) { if (!wallet->mapWallet.count(outpoint.hash)) continue; |