1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 16:10:06 +02:00

Avoid some unexpected recursions because of yields to event loop...

... See code comments.

Not proved to be a cause of data loss bugs, but they caused surprises when
trying to step in the debugger.
This commit is contained in:
Paul Licameli 2020-08-26 16:01:54 -04:00
parent 11e924a49b
commit 0c4514efb0
2 changed files with 18 additions and 4 deletions

View File

@ -910,16 +910,21 @@ void ProjectAudioManager::OnAudioIOStopRecording()
history.ModifyState( true ); // this might fail and throw
ShowWarningDialog(&window, wxT("DropoutDetected"), XO("\
// CallAfter so that we avoid any problems of yielding
// to the event loop while still inside the timer callback,
// entering StopStream() recursively
wxTheApp->CallAfter( [&] {
ShowWarningDialog(&window, wxT("DropoutDetected"), XO("\
Recorded audio was lost at the labeled locations. Possible causes:\n\
\n\
Other applications are competing with Audacity for processor time\n\
\n\
You are saving directly to a slow external storage device\n\
"
),
false,
XXO("Turn off dropout detection"));
),
false,
XXO("Turn off dropout detection"));
});
}
}
}

View File

@ -268,6 +268,15 @@ SqliteSampleBlock::SqliteSampleBlock(
SqliteSampleBlock::~SqliteSampleBlock()
{
if (mBlockID == 0) {
// The block object was constructed but failed to Load() or Commit().
// Just let the stack unwind. Don't violate the assertion in
// Delete(), which may do odd recursive things in debug builds when it
// yields to the UI to put up a dialog, but then dispatches timer
// events that try again to finish recording.
return;
}
// See ProjectFileIO::Bypass() for a description of mIO.mBypass
if (!mLocked && !Conn()->ShouldBypass())
{