diff --git a/src/CommonCommandFlags.cpp b/src/CommonCommandFlags.cpp index 3477daed3..008975323 100644 --- a/src/CommonCommandFlags.cpp +++ b/src/CommonCommandFlags.cpp @@ -71,7 +71,8 @@ bool TimeSelectedPred( const AudacityProject &project ) return !ViewInfo::Get( project ).selectedRegion.isPoint(); }; -const CommandFlagOptions cutCopyOptions{ +const CommandFlagOptions &cutCopyOptions() { +static CommandFlagOptions result{ // In reporting the issue with cut or copy, we don't tell the user they could also select some text in a label. []( const TranslatableString &Name ) { // PRL: These strings have hard-coded mention of a certain shortcut key, @@ -101,6 +102,8 @@ const CommandFlagOptions cutCopyOptions{ "Selecting_Audio_-_the_basics", XO("No Audio Selected") }; +return result; +} // Noise Reduction has a custom error message, when nothing selected. const CommandFlagOptions noiseReductionOptions{ @@ -153,7 +156,7 @@ const ReservedCommandFlag }, TimeSelectedFlag{ TimeSelectedPred, - cutCopyOptions + cutCopyOptions() }, WaveTracksSelectedFlag{ [](const AudacityProject &project){ diff --git a/src/CommonCommandFlags.h b/src/CommonCommandFlags.h index 1d497e973..88b442761 100644 --- a/src/CommonCommandFlags.h +++ b/src/CommonCommandFlags.h @@ -18,7 +18,7 @@ Paul Licameli split from Menus.cpp bool TracksSelectedPred( const AudacityProject &project ); bool AudioIOBusyPred( const AudacityProject &project ); bool TimeSelectedPred( const AudacityProject &project ); -extern const CommandFlagOptions cutCopyOptions; +extern const CommandFlagOptions &cutCopyOptions(); extern AUDACITY_DLL_API const ReservedCommandFlag AudioIONotBusyFlag, diff --git a/src/menus/EditMenus.cpp b/src/menus/EditMenus.cpp index a9e9719d5..be180bc30 100644 --- a/src/menus/EditMenus.cpp +++ b/src/menus/EditMenus.cpp @@ -1025,7 +1025,7 @@ const ReservedCommandFlag return false; }, - cutCopyOptions + cutCopyOptions() }; MenuTable::BaseItemPtr EditMenu( AudacityProject & )