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

Move Nyquist Workbench to Tools menu

Browse Source 
Also disable and comment an incorrect ASSERT.
This commit is contained in:
James Crook 2018-04-06 14:27:33 +01:00
parent 31ce57e324
commit 6e59c2e286
1 changed files with 4 additions and 2 deletions

6
lib-src/mod-nyq-bench/NyqBench.cpp

@ -169,7 +169,9 @@ extern "C"
int ModuleDispatch(ModuleDispatchTypes type){ int ModuleDispatch(ModuleDispatchTypes type){
switch (type){ switch (type){
case AppQuiting: { case AppQuiting: {
wxASSERT(gBench != NULL); //It is perfectly OK for gBench to be NULL.
//Can happen if the menu item was never invoked.
//wxASSERT(gBench != NULL);
if (gBench) { if (gBench) {
gBench->Destroy(); gBench->Destroy();
gBench = NULL; gBench = NULL;
@ -185,7 +187,7 @@ extern "C"
wxMenuBar * pBar = p->GetMenuBar(); wxMenuBar * pBar = p->GetMenuBar();
wxASSERT(pBar != NULL ); wxASSERT(pBar != NULL );
wxMenu * pMenu = pBar->GetMenu( 2 ); // Menu 2 is the View Menu. wxMenu * pMenu = pBar->GetMenu( 9 ); // Menu 9 is the Tools Menu.
wxASSERT( pMenu != NULL ); wxASSERT( pMenu != NULL );
c->SetCurrentMenu(pMenu); c->SetCurrentMenu(pMenu);