mirror of
https://github.com/cookiengineer/audacity
synced 2026-02-09 05:01:57 +01:00
Don't reuse EditActions::DoUndo...
... instead, when timer recording is cancelled, don't push state and pop it at once, but just roll it back.
This commit is contained in:
@@ -17,7 +17,6 @@ Paul Licameli split from ProjectManager.cpp
|
||||
#include "AutoRecovery.h"
|
||||
#include "DirManager.h"
|
||||
#include "LabelTrack.h"
|
||||
#include "Menus.h"
|
||||
#include "Project.h"
|
||||
#include "ProjectAudioIO.h"
|
||||
#include "ProjectFileIO.h"
|
||||
@@ -25,6 +24,7 @@ Paul Licameli split from ProjectManager.cpp
|
||||
#include "ProjectSettings.h"
|
||||
#include "ProjectWindow.h"
|
||||
#include "TimeTrack.h"
|
||||
#include "UndoManager.h"
|
||||
#include "toolbars/ControlToolBar.h"
|
||||
#include "widgets/ErrorDialog.h"
|
||||
#include "widgets/Warning.h"
|
||||
@@ -135,16 +135,17 @@ You are saving directly to a slow external storage device\n\
|
||||
_("Turn off dropout detection"));
|
||||
}
|
||||
|
||||
// Add to history
|
||||
auto &history = ProjectHistory::Get( project );
|
||||
history.PushState(_("Recorded Audio"), _("Record"));
|
||||
|
||||
// Reset timer record
|
||||
if (IsTimerRecordCancelled())
|
||||
{
|
||||
EditActions::DoUndo( project );
|
||||
if (IsTimerRecordCancelled()) {
|
||||
// discard recording
|
||||
history.RollbackState();
|
||||
// Reset timer record
|
||||
ResetTimerRecordCancelled();
|
||||
}
|
||||
else
|
||||
// Add to history
|
||||
history.PushState(_("Recorded Audio"), _("Record"));
|
||||
|
||||
// Refresh the project window
|
||||
window.FixScrollbars();
|
||||
|
||||
Reference in New Issue
Block a user