Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Fixed undo_database

Browse source
This commit is contained in:
Peter Conrad 2017-08-06 14:20:04 +02:00 committed by gladcow
parent 631849e7cc
commit e905534ea6
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/db/undo_database.cpp
View file

@ -118,8 +118,6 @@ void undo_database::undo()
_db.insert( std::move(*item.second) ); _db.insert( std::move(*item.second) );
_stack.pop_back(); _stack.pop_back();
if( _stack.empty() )
_stack.emplace_back();
enable(); enable();
--_active_sessions; --_active_sessions;
} FC_CAPTURE_AND_RETHROW() } } FC_CAPTURE_AND_RETHROW() }
@ -127,6 +125,12 @@ void undo_database::undo()
void undo_database::merge() void undo_database::merge()
{ {
FC_ASSERT( _active_sessions > 0 ); FC_ASSERT( _active_sessions > 0 );
if( _active_sessions == 1 && _stack.size() == 1 )
{
_stack.pop_back();
--_active_sessions;
return;
}
FC_ASSERT( _stack.size() >=2 ); FC_ASSERT( _stack.size() >=2 );
auto& state = _stack.back(); auto& state = _stack.back();
auto& prev_state = _stack[_stack.size()-2]; auto& prev_state = _stack[_stack.size()-2];