Skip to content
Merged
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
4 changes: 2 additions & 2 deletions src/controllers/dlgprefcontroller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ void DlgPrefController::slotApply() {

QString mappingPath = mappingPathFromIndex(m_ui.comboBoxMapping->currentIndex());
m_pMapping = LegacyControllerMappingFileHandler::loadMapping(
mappingPath, QDir(resourceMappingsPath(m_pConfig)));
QFileInfo(mappingPath), QDir(resourceMappingsPath(m_pConfig)));

// Load the resulting mapping (which has been mutated by the input/output
// table models). The controller clones the mapping so we aren't touching
Expand Down Expand Up @@ -581,7 +581,7 @@ void DlgPrefController::slotMappingSelected(int chosenIndex) {

std::shared_ptr<LegacyControllerMapping> pMapping =
LegacyControllerMappingFileHandler::loadMapping(
mappingPath, QDir(resourceMappingsPath(m_pConfig)));
QFileInfo(mappingPath), QDir(resourceMappingsPath(m_pConfig)));

if (pMapping) {
DEBUG_ASSERT(!pMapping->isDirty());
Expand Down