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

a null check on GetActiveProject()

Browse Source
This commit is contained in:
Paul Licameli 2019-05-21 20:43:49 -04:00
parent 93c2a692c1
commit aef4b80d53
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/AudacityApp.cpp
View File

@ -1706,23 +1706,25 @@ void AudacityApp::OnKeyDown(wxKeyEvent &event)
if(event.GetKeyCode() == WXK_ESCAPE) { if(event.GetKeyCode() == WXK_ESCAPE) {
// Stop play, including scrub, but not record // Stop play, including scrub, but not record
auto project = ::GetActiveProject(); auto project = ::GetActiveProject();
auto token = ProjectAudioIO::Get( *project ).GetAudioIOToken(); if ( project ) {
auto &scrubber = Scrubber::Get( *project ); auto token = ProjectAudioIO::Get( *project ).GetAudioIOToken();
auto scrubbing = scrubber.HasMark(); auto &scrubber = Scrubber::Get( *project );
if (scrubbing) auto scrubbing = scrubber.HasMark();
scrubber.Cancel(); if (scrubbing)
auto gAudioIO = AudioIO::Get(); scrubber.Cancel();
if((token > 0 && auto gAudioIO = AudioIO::Get();
gAudioIO->IsAudioTokenActive(token) && if((token > 0 &&
gAudioIO->GetNumCaptureChannels() == 0) || gAudioIO->IsAudioTokenActive(token) &&
scrubbing) gAudioIO->GetNumCaptureChannels() == 0) ||
// ESC out of other play (but not record) scrubbing)
ProjectAudioManager::Get( *project ).Stop(); // ESC out of other play (but not record)
else ProjectAudioManager::Get( *project ).Stop();
event.Skip(); else
event.Skip();
}
} }
else
event.Skip(); event.Skip();
} }
// Ensures directory is created and puts the name into result. // Ensures directory is created and puts the name into result.