Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eliminated a MacOs debug alert when opening a settings dialog https://github.com/GrandOrgue/grandorgue/issues/2003 #2071

Merged
merged 1 commit into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Eliminated a MacOs debug alert when opening a settings dialog #2003
  • Loading branch information
oleg68 committed Dec 14, 2024
commit 2099e95ea668c386ca22339e680f75dbf1ac0884
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
- Eliminated a MacOs debug alert when opening a settings dialog https://github.com/GrandOrgue/grandorgue/issues/2003
- Fixed not releasing a pipe after fast switching between vave-based tremulant samples and regular pipe samples https://github.com/GrandOrgue/grandorgue/issues/2004
- Removed support of MacOs 12
- Fixed hang if there were lots of unused ODF entries https://github.com/GrandOrgue/grandorgue/issues/1918
Expand Down
11 changes: 6 additions & 5 deletions src/grandorgue/gui/dialogs/settings/GOSettingsPorts.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 2006 Milan Digital Audio LLC
* Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
* Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
* License GPL-2.0 or later
* (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
*/
Expand Down Expand Up @@ -94,12 +94,13 @@ void GOSettingsPorts::FillPortsWith(const GOPortsConfig &config) {
m_Ports->DeleteAllItems();

for (const wxString &portName : m_PortFactory.GetPortNames()) {
const bool isToShowPort = m_PortFactory.IsToUsePortName();
const wxTreeListItem &rootItem = m_Ports->GetRootItem();
const wxTreeListItem &portItem = m_PortFactory.IsToUsePortName()
? AddPortItem(rootItem, portName)
: rootItem;
const wxTreeListItem &portItem
= isToShowPort ? AddPortItem(rootItem, portName) : rootItem;

SetPortItemChecked(portItem, m_PortsConfig.IsConfigEnabled(portName));
if (isToShowPort)
SetPortItemChecked(portItem, m_PortsConfig.IsConfigEnabled(portName));
for (const wxString &apiName : m_PortFactory.GetPortApiNames(portName)) {
const wxTreeListItem portApiItem
= AddPortItem(portItem, portName, apiName);
Expand Down
Loading