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

Bug 1648 - Crash clicking Help icon in Spectrograms Settings

Browse Source
This commit is contained in:
James Crook 2017-05-20 09:25:18 +01:00
parent 01f853f174
commit 4e187d0ce0
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/prefs/PrefsDialog.cpp
View File

@ -280,6 +280,10 @@ PrefsDialog::PrefsDialog
S.EndHorizontalLay();
}
else {
// TODO: Look into getting rid of mUniquePage and instead
// adding into mCategories, so there is just one page in mCategories.
// And then hiding the trrebook.
// Unique page, don't show the factory
const PrefsNode &node = factories[0];
PrefsPanelFactory &factory = *node.pFactory;
@ -386,18 +390,25 @@ void PrefsDialog::OnCancel(wxCommandEvent & WXUNUSED(event))
EndModal(false);
}
PrefsPanel * PrefsDialog::GetCurrentPanel()
{
if( mCategories)
return static_cast<PrefsPanel*>(mCategories->GetCurrentPage());
else
{
wxASSERT( mUniquePage );
return mUniquePage;
}
}
void PrefsDialog::OnApply(wxCommandEvent & WXUNUSED(event))
{
if (mCategories)
static_cast<PrefsPanel*>(mCategories->GetCurrentPage())->Apply();
else
mUniquePage->Apply();
GetCurrentPanel()->Apply();
}
void PrefsDialog::OnHelp(wxCommandEvent & WXUNUSED(event))
{
PrefsPanel* panel = static_cast<PrefsPanel*>(mCategories->GetCurrentPage());
HelpSystem::ShowHelpDialog(this, panel->HelpPageName(), true);
HelpSystem::ShowHelpDialog(this, GetCurrentPanel()->HelpPageName(), true);
}
void PrefsDialog::OnTreeKeyDown(wxTreeEvent & event)

1
src/prefs/PrefsDialog.h
View File

@ -78,6 +78,7 @@ class PrefsDialog /* not final */ : public wxDialogWrapper
private:
void RecordExpansionState();
PrefsPanel * GetCurrentPanel();
wxTreebook *mCategories{};
PrefsPanel *mUniquePage{};
Factories &mFactories;