Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-16 16:20:50 +02:00
Code Issues Releases Wiki Activity

First commit

Browse Source 
If any of the commands are cancels, an entry for the macro remains in history.
This commit is contained in:
David Bailes 2020-07-02 15:00:38 +01:00
parent 4f129ae0af
commit d966303558
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/BatchCommands.cpp
View File

@ -966,19 +966,16 @@ bool MacroCommands::ApplyMacro(
if (proj) {
ProjectHistory::Get(*proj).PushState(longDesc, shortDesc);
}
// Upon exit of the top level apply, roll back the state if
// an error occurs.
auto cleanup2 = finally([&] {
if (!res) {
if (proj) {
// Macro failed or was cancelled; revert to the previous state
ProjectHistory::Get(*proj).RollbackState();
}
}
});
}
// Upon exit of the top level apply, roll back the state if an error occurs.
auto cleanup2 = finally([&] {
if (MacroReentryCount == 1 && !res && proj) {
// Macro failed or was cancelled; revert to the previous state
ProjectHistory::Get(*proj).RollbackState();
}
});
mAbort = false;
size_t i = 0;