1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-04-05 05:47:41 +02:00

Fix static initialization order problem for more ReservedCommandFlags

This commit is contained in:
Paul Licameli
2020-01-29 11:15:19 -05:00
parent 25afa10bc4
commit ef41b8f2ee
4 changed files with 65 additions and 63 deletions

View File

@@ -770,12 +770,12 @@ MenuTable::BaseItemSharedPtr GenerateMenu()
return menu;
}
const ReservedCommandFlag
IsRealtimeNotActiveFlag{
[](const AudacityProject &){
return !RealtimeEffectManager::Get().RealtimeIsActive();
}
}; //lll
static const ReservedCommandFlag
&IsRealtimeNotActiveFlag() { static ReservedCommandFlag flag{
[](const AudacityProject &){
return !RealtimeEffectManager::Get().RealtimeIsActive();
}
}; return flag; } //lll
// Under /MenuBar
MenuTable::BaseItemSharedPtr EffectMenu()
@@ -820,7 +820,7 @@ MenuTable::BaseItemSharedPtr EffectMenu()
{ return Items( wxEmptyString, PopulateEffectsMenu(
EffectTypeProcess,
AudioIONotBusyFlag() | TimeSelectedFlag() | WaveTracksSelectedFlag(),
IsRealtimeNotActiveFlag )
IsRealtimeNotActiveFlag() )
); }
) ) };
@@ -856,7 +856,7 @@ MenuTable::BaseItemSharedPtr AnalyzeMenu()
{ return Items( wxEmptyString, PopulateEffectsMenu(
EffectTypeAnalyze,
AudioIONotBusyFlag() | TimeSelectedFlag() | WaveTracksSelectedFlag(),
IsRealtimeNotActiveFlag )
IsRealtimeNotActiveFlag() )
); }
) ) };
return menu;