1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-14 09:03:54 +01: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

@@ -255,7 +255,9 @@ static const auto HasWaveDataPred =
};
static const ReservedCommandFlag
HasWaveDataFlag{ HasWaveDataPred }; // jkc
&HasWaveDataFlag() { static ReservedCommandFlag flag{
HasWaveDataPred
}; return flag; } // jkc
namespace {
struct MenuItem {
@@ -278,12 +280,12 @@ namespace {
"Seeking" is normal speed playback but with skips, ...
*/
{ wxT("Scrub"), XO("&Scrub"), XO("Scrubbing"),
CaptureNotBusyFlag() | HasWaveDataFlag,
CaptureNotBusyFlag() | HasWaveDataFlag(),
&Scrubber::OnScrub, false, &Scrubber::Scrubs,
},
{ wxT("Seek"), XO("See&k"), XO("Seeking"),
CaptureNotBusyFlag() | HasWaveDataFlag,
CaptureNotBusyFlag() | HasWaveDataFlag(),
&Scrubber::OnSeek, true, &Scrubber::Seeks,
},