From dea880dbf451e1b0ae1cdbff8643d3eb9208f536 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Tue, 23 Feb 2016 07:29:07 -0800 Subject: [PATCH] Better handle duplicate HRTF names in alsoft-config --- utils/alsoft-config/mainwindow.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp index 315ef491..17407498 100644 --- a/utils/alsoft-config/mainwindow.cpp +++ b/utils/alsoft-config/mainwindow.cpp @@ -357,7 +357,23 @@ QStringList MainWindow::collectDefaultHrtfs() foreach(const QString &fname, fnames) { if(fname.endsWith(".mhr", Qt::CaseInsensitive)) - ret.push_back(fname); + { + if(!ret.contains(fname)) + ret.push_back(fname); + else + { + size_t i = 1; + do { + QString s = fname+" #"+QString::number(i); + if(!ret.contains(s)) + { + ret.push_back(s); + break; + } + ++i; + } while(1); + } + } } } return ret;