Skip to content

Fix learning with "No Mapping" selected #14829

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.

Sign up for GitHub

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

Merged
ronso0 merged 2 commits into from
May 22, 2025
Merged

Fix learning with "No Mapping" selected #14829

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fe69de
Fix out of bounds access in DlgPrefController::enumerateMappings()
daschuer May 22, 2025
ccdd44f
Fix learing with "No Mapping" selected
daschuer May 22, 2025
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
22 changes: 15 additions & 7 deletions src/controllers/dlgprefcontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
#include "util/string.h"

namespace {

constexpr int kNoMappingIndex = 0; // "No Mapping" is always at the first position;

const QString kMappingExt(".midi.xml");

QString mappingNameToPath(const QString& directory, const QString& mappingName) {
Expand Down Expand Up @@ -459,17 +462,19 @@ void DlgPrefController::enumerateMappings(const QString& selectedMappingPath) {
}

// Preselect configured or matching mapping
int index = -1;
int index = kNoMappingIndex;
if (!selectedMappingPath.isEmpty()) {
index = m_ui.comboBoxMapping->findData(selectedMappingPath);
} else if (match.isValid()) {
index = m_ui.comboBoxMapping->findText(match.getName());
}
QString newMappingFilePath = mappingFilePathFromIndex(index);
if (index == -1) {
QString newMappingFilePath;
if (index <= kNoMappingIndex) { // findData() returns -1 for not found
index = kNoMappingIndex;
m_ui.chkEnabledDevice->setEnabled(false);
m_ui.groupBoxSettings->setVisible(false);
} else {
newMappingFilePath = mappingFilePathFromIndex(index);
m_ui.comboBoxMapping->setCurrentIndex(index);
m_ui.chkEnabledDevice->setEnabled(true);
}
Expand Down Expand Up @@ -506,8 +511,12 @@ MappingInfo DlgPrefController::enumerateMappingsFromEnumerator(
void DlgPrefController::slotUpdate() {
enumerateMappings(m_pControllerManager->getConfiguredMappingFileForDevice(
m_pController->getName()));
// Force updating the controller settings
slotMappingSelected(m_ui.comboBoxMapping->currentIndex());
// Note: this is called by closeDlg() when MIDI learning starts
// "No Mapping" is selected but we have a mapping for learning
if (m_ui.comboBoxMapping->currentIndex() > kNoMappingIndex || !m_pMapping) {
// Force updating the controller settings
slotMappingSelected(m_ui.comboBoxMapping->currentIndex());
}
Comment on lines +514 to +519
Copy link
Copy Markdown
Member

@ronso0 ronso0 May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!
I was puzzled what was calling showMapping() and that's it.


// enumerateMappings() calls slotMappingSelected() which will tick the 'Enabled'
// checkbox if there is a valid mapping saved in the mixxx.cfg file.
Expand Down Expand Up @@ -614,8 +623,7 @@ void DlgPrefController::enableWizardAndIOTabs(bool enable) {
}

QString DlgPrefController::mappingFilePathFromIndex(int index) const {
if (index == 0) {
// "No Mapping" item
if (index <= kNoMappingIndex) {
return QString();
}

Expand Down