mirror of
https://github.com/cookiengineer/audacity
synced 2025-07-03 06:03:13 +02:00
Merge branch 'master' into scrubbing2
This commit is contained in:
commit
bdb96f659c
@ -877,7 +877,10 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
|
||||
}
|
||||
|
||||
if (gAudioIO->IsBusy()) {
|
||||
mRecord->PopUp();
|
||||
if (!CanStopAudioStream() || 0 == gAudioIO->GetNumCaptureChannels())
|
||||
mRecord->PopUp();
|
||||
else
|
||||
mRecord->PushDown();
|
||||
return;
|
||||
}
|
||||
AudacityProject *p = GetActiveProject();
|
||||
@ -1275,4 +1278,3 @@ void ControlToolBar::UpdateStatusBar(AudacityProject *pProject)
|
||||
{
|
||||
pProject->GetStatusBar()->SetStatusText(StateForStatusBar(), stateStatusBarField);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user