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

Bug 1575 Residual - When label tracks exist, Nyquist effects run extremely slowly

Browse Source 
The short-circuit evaluation of flags ONLY generated the NotMinimized flag, and all others were set to zero, when short-circuit evaluation happened.  This change remembers and preserves the other flags, so they don't get set to zero.
This commit is contained in:
James Crook 2017-01-16 17:08:21 +00:00
parent 15aa84f10b
commit 0bc20269a7
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Menus.cpp
View File

@ -1702,6 +1702,8 @@ CommandFlag AudacityProject::GetUpdateFlags(bool checkActive)
// and returns them in a bitfield. Note that if none of the flags
// have changed, it's not necessary to even check for updates.
auto flags = AlwaysEnabledFlag;
// static variable, used to remember flags for next time.
static auto lastFlags = flags;
if (auto focus = wxWindow::FindFocus()) {
while (focus && focus->GetParent())
@ -1710,8 +1712,13 @@ CommandFlag AudacityProject::GetUpdateFlags(bool checkActive)
flags |= NotMinimizedFlag;
}
if ( checkActive && !IsActive() )
// quick 'short-circuit' return.
if ( checkActive && !IsActive() ){
// short cirucit return should preserve flags that have not been calculated.
flags = (lastFlags & ~NotMinimizedFlag) | flags;
lastFlags = flags;
return flags;
}
if (!gAudioIO->IsAudioTokenActive(GetAudioIOToken()))
flags |= AudioIONotBusyFlag;
@ -1842,6 +1849,7 @@ CommandFlag AudacityProject::GetUpdateFlags(bool checkActive)
if (bar->ControlToolBar::CanStopAudioStream())
flags |= CanStopAudioStreamFlag;
lastFlags = flags;
return flags;
}
@ -1976,6 +1984,7 @@ void AudacityProject::UpdateMenus(bool checkActive)
if (flags == mLastFlags)
return;
mLastFlags = flags;
wxLogDebug("Flags %016lX", (unsigned long) flags );
mCommandManager.EnableUsingFlags(flags2 , NoFlagsSpecifed);