Bug #444 - Interactive undo locks pending.data and doesn't give it up

- TDB::undo () now exits gracefully when a user declines to proceed with
  the undo, ensuring context.tdb.unlock () is called
This commit is contained in:
Cory Donnelly 2010-07-28 10:18:34 -04:00
parent 96bd3ff8db
commit 189fdaf9ac
2 changed files with 7 additions and 1 deletions

View file

@ -38,6 +38,8 @@
substitution (thanks to Michelle Crane). substitution (thanks to Michelle Crane).
+ Fixed problem with command line configuration overrides that had no + Fixed problem with command line configuration overrides that had no
values. values.
+ Fixed bug #444, which made task shell unusable after canceling out of an
undo command.
------ old releases ------------------------------ ------ old releases ------------------------------

View file

@ -933,7 +933,11 @@ void TDB::undo ()
// Output displayed, now confirm. // Output displayed, now confirm.
if (!confirm ("The undo command is not reversible. Are you sure you want to revert to the previous state?")) if (!confirm ("The undo command is not reversible. Are you sure you want to revert to the previous state?"))
throw std::string ("No changes made."); {
std::cout << "No changes made." << std::endl;
context.hooks.trigger ("post-undo");
return;
}
// Extract identifying uuid. // Extract identifying uuid.
std::string uuid; std::string uuid;