From b71f20e06018f8c0d70fc3a559f41581b8ab3d7e Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Fri, 4 Aug 2017 17:55:13 +0200 Subject: [PATCH] Dont leave _data_dir empty if db is locked --- libraries/db/object_database.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/db/object_database.cpp b/libraries/db/object_database.cpp index 9d251645..03ded276 100644 --- a/libraries/db/object_database.cpp +++ b/libraries/db/object_database.cpp @@ -93,13 +93,13 @@ void object_database::wipe(const fc::path& data_dir) void object_database::open(const fc::path& data_dir) { try { - if( fc::exists( data_dir / "object_database" / "lock" ) ) + _data_dir = data_dir; + if( fc::exists( _data_dir / "object_database" / "lock" ) ) { wlog("Ignoring locked object_database"); return; } ilog("Opening object database from ${d} ...", ("d", data_dir)); - _data_dir = data_dir; for( uint32_t space = 0; space < _index.size(); ++space ) for( uint32_t type = 0; type < _index[space].size(); ++type ) if( _index[space][type] )