aboutsummaryrefslogtreecommitdiff
path: root/db.h
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2010-10-19 14:17:18 -0400
committerGavin Andresen <gavinandresen@gmail.com>2010-10-19 14:17:18 -0400
commitd1e4a866adc92fd456c0a3139dcaefeb47b8c025 (patch)
tree0ec5e0817784154794dd9b43695cf0b72291406c /db.h
parent2bda554be4a7fc38075f93d301d971df31b2a27d (diff)
parent5cbf75324d1509a1262b65c5073314a4da3f6d77 (diff)
downloadbitcoin-d1e4a866adc92fd456c0a3139dcaefeb47b8c025.tar.xz
Merge remote branch 'refs/remotes/svn/trunk' into svn
Diffstat (limited to 'db.h')
-rw-r--r--db.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/db.h b/db.h
index dac277a016..385b898bc8 100644
--- a/db.h
+++ b/db.h
@@ -455,7 +455,8 @@ public:
~CReserveKey()
{
- ReturnKey();
+ if (!fShutdown)
+ ReturnKey();
}
vector<unsigned char> GetReservedKey()