Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-04 22:49:07 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into scrubbing2

Browse Source
This commit is contained in:
Paul Licameli 2016-05-18 11:23:38 -04:00
commit bdb96f659c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/toolbars/ControlToolBar.cpp
View File

@ -877,7 +877,10 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
} }
if (gAudioIO->IsBusy()) { if (gAudioIO->IsBusy()) {
if (!CanStopAudioStream() || 0 == gAudioIO->GetNumCaptureChannels())
mRecord->PopUp(); mRecord->PopUp();
else
mRecord->PushDown();
return; return;
} }
AudacityProject *p = GetActiveProject(); AudacityProject *p = GetActiveProject();
@ -1275,4 +1278,3 @@ void ControlToolBar::UpdateStatusBar(AudacityProject *pProject)
{ {
pProject->GetStatusBar()->SetStatusText(StateForStatusBar(), stateStatusBarField); pProject->GetStatusBar()->SetStatusText(StateForStatusBar(), stateStatusBarField);
} }