1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-22 23:48:02 +02:00

Merge branch 'master' into scrubbing2

This commit is contained in:
Paul Licameli 2016-05-12 16:48:50 -04:00
commit 968596f77c

View File

@ -1124,10 +1124,6 @@ AudacityProject::~AudacityProject()
wxCommandEventHandler(AudacityProject::OnCapture),
NULL,
this);
// Do this before destroying the overlays
delete mRuler;
mRuler = nullptr;
}
AudioIOStartStreamOptions AudacityProject::GetDefaultPlayOptions()
@ -2420,8 +2416,10 @@ void AudacityProject::OnCloseWindow(wxCloseEvent & event)
&mViewInfo);
Destroy();
mRuler = nullptr;
mIsBeingDeleted = true;
}
void AudacityProject::OnOpenAudioFile(wxCommandEvent & event)